diff --git a/tracker/instruments.go b/tracker/instruments.go
index a96c307..2aff3f7 100644
--- a/tracker/instruments.go
+++ b/tracker/instruments.go
@@ -14,9 +14,6 @@ import (
 	"golang.org/x/exp/shiny/materialdesign/icons"
 )
 
-type C = layout.Context
-type D = layout.Dimensions
-
 func (t *Tracker) updateInstrumentScroll() {
 	if t.CurrentInstrument > 7 {
 		t.InstrumentDragList.List.Position.First = t.CurrentInstrument - 7
diff --git a/tracker/layout.go b/tracker/layout.go
index 50a7a5f..9b33e87 100644
--- a/tracker/layout.go
+++ b/tracker/layout.go
@@ -11,6 +11,9 @@ import (
 	"gioui.org/widget/material"
 )
 
+type C = layout.Context
+type D = layout.Dimensions
+
 func smallButton(icStyle material.IconButtonStyle) material.IconButtonStyle {
 	icStyle.Size = unit.Dp(14)
 	icStyle.Inset = layout.UniformInset(unit.Dp(1))