diff --git a/PhotoStepper/PhotoStepper.ino b/PhotoStepper/PhotoStepper.ino
index c005b90..5906bf6 100644
--- a/PhotoStepper/PhotoStepper.ino
+++ b/PhotoStepper/PhotoStepper.ino
@@ -81,18 +81,37 @@ result enter_jog() {
   return proceed;
 }
 
+int tSettle = 100;
+int tFocus = 500;
+int tShutter = 500;
+bool bReturn = true;
+bool bLcdBlackout = true;
+
+TOGGLE(bReturn, setReturn, "Return: ", doNothing, noEvent, wrapStyle
+  ,VALUE("On", true, doNothing, noEvent)
+  ,VALUE("Off", false, doNothing, noEvent)
+);
+
+TOGGLE(bLcdBlackout, setLcdBlackout, "LCD Blackout: ", doNothing, noEvent, wrapStyle
+  ,VALUE("On", true, doNothing, noEvent)
+  ,VALUE("Off", false, doNothing, noEvent)
+);
+
 MENU(configuration, "Configuration", doNothing, anyEvent, wrapStyle
-  ,OP("tSettle", doNothing, noEvent)
-  ,OP("tFocus", doNothing, noEvent)
-  ,OP("tShutter", doNothing, noEvent)
-  ,OP("Return", doNothing, noEvent)
-  ,OP("LcdBlackout", doNothing, noEvent)
+  ,FIELD(tSettle, "tSettle", "ms", 0, 2000, 100, 10, doNothing, noEvent, wrapStyle)
+  ,FIELD(tFocus, "tFocus", "ms", 0, 2000, 500, 10, doNothing, noEvent, wrapStyle)
+  ,FIELD(tShutter, "tShutter", "ms", 0, 2000, 500, 10, doNothing, noEvent, wrapStyle)
+  ,SUBMENU(setReturn)
+  ,SUBMENU(setLcdBlackout)
   ,EXIT("<Back")
 );
 
+int nSteps = 10;
+float distance = 0.5;
+
 MENU(scene, "Scene", doNothing, anyEvent, wrapStyle
-  ,OP("nSteps", doNothing, noEvent)
-  ,OP("Distance", doNothing, noEvent)
+  ,FIELD(nSteps, "nSteps", "steps", 0, 100, 10, 1, doNothing, noEvent, wrapStyle)
+  ,FIELD(distance, "distance", "mm", 0.1, 10, 1, 0.1, doNothing, noEvent, wrapStyle)
   ,EXIT("<Back")
 );