diff --git a/src/display.c b/src/display.c
--- a/src/display.c
+++ b/src/display.c
@@ -563,7 +563,7 @@ void display_process(void)
             ssd1306_drawchar(updown(), 1, 52);
 
             char tempstr[12];
-            snprintf(tempstr, 12, "O=%ld", set->val.temp_offset);
+            snprintf(tempstr, 12, "O=%.1f  ", set->val.temp_offset);
             ssd1306_drawstring(tempstr, 1, 60);
 
             ssd1306_drawstring("Press to accept", 3, 40);
@@ -574,7 +574,7 @@ void display_process(void)
                 status->state = STATE_IDLE;
             }
             else {
-                user_input_signed(&set->val.temp_offset);
+                user_input_float(&set->val.temp_offset);
             }
 
             // Event Handler
@@ -589,9 +589,13 @@ void display_process(void)
             // [ therm : preheating brew ]
             // [ 30 => 120 C             ]
             if(set->val.plant_type == PLANT_HEATER)
-                ssd1306_drawstring("Preheating...", 0, 0);
+                ssd1306_drawstring("Preheat...", 0, 0);
             else
-                ssd1306_drawstring("Precooling...", 0, 0);
+                ssd1306_drawstring("Precool...", 0, 0);
+
+            char tempstr[4];
+            snprintf(tempstr, 4, "#%d  ", (status->setpoint_index + 1));
+            ssd1306_drawstring(tempstr, 0, 65);
 
             //ssd1306_drawlogo();
             draw_setpoint(status);
@@ -619,7 +623,7 @@ void display_process(void)
                 }
             }
             else {
-                user_input_signed(&set->val.setpoints[status->setpoint_index]);
+                user_input_float(&set->val.setpoints[status->setpoint_index]);
             }
 
             // Event Handler
@@ -649,6 +653,10 @@ void display_process(void)
             else
                 ssd1306_drawstring("Precooled!", 0, 0);
 
+            char tempstr[4];
+            snprintf(tempstr, 4, "#%d  ", (status->setpoint_index + 1));
+            ssd1306_drawstring(tempstr, 0, 65);
+
             draw_setpoint(status);
             status->pid_enabled = 1;
             status->setpoint = set->val.setpoints[status->setpoint_index];
@@ -673,7 +681,7 @@ void display_process(void)
                 }
             }
             else {
-                user_input_signed(&set->val.setpoints[status->setpoint_index]);
+                user_input_float(&set->val.setpoints[status->setpoint_index]);
             }
 
             // Event Handler
@@ -842,7 +850,7 @@ static void draw_setpoint(therm_status_t
 
     if(status->setpoint != setpoint_last || trigger_drawsetpoint) {
         char tempstr[4];
-        snprintf(tempstr, 4, "%ld     ", status->setpoint);
+        snprintf(tempstr, 4, "%3.0f     ", status->setpoint);
         ssd1306_drawstringbig(tempstr, 3, 90);
     }