diff --git a/display.c b/display.c
--- a/display.c
+++ b/display.c
@@ -1,15 +1,5 @@
-#include "stm32f0xx_hal.h"
-#include "ssd1306.h"
-#include "stringhelpers.h"
 #include "display.h"
-#include "config.h"
-#include "states.h"
-#include "syslib.h"
-#include "flash.h"
-#include "gpio.h"
-#ifdef MAX31865_RTD_SENSOR
-#include "max31865.h"
-#endif
+
 
 // Private function prototypes
 static void draw_setpoint(therm_status_t* status);
@@ -159,7 +149,7 @@ void display_process(therm_settings_t* s
                 status->state = STATE_SETI;
             }
             else {
-                user_input(&set->val.k_p);
+                user_input((uint16_t*)&set->val.k_p);
             }
 
             // Event Handler
@@ -188,7 +178,7 @@ void display_process(therm_settings_t* s
                 status->state = STATE_SETD;
             }
             else {
-                user_input(&set->val.k_i);
+                user_input((uint16_t*)&set->val.k_i);
             }
 
             // Event Handler
@@ -217,7 +207,7 @@ void display_process(therm_settings_t* s
                 status->state = STATE_SETWINDUP;
             }
             else {
-                user_input(&set->val.k_d);
+                user_input((uint16_t*)&set->val.k_d);
             }
 
             // Event Handler
@@ -246,7 +236,7 @@ void display_process(therm_settings_t* s
                 status->state = STATE_SETBOOTTOBREW;
             }
             else {
-                user_input(&set->val.windup_guard);
+                user_input((uint16_t*)&set->val.windup_guard);
             }
 
             // Event Handler
@@ -341,7 +331,7 @@ void display_process(therm_settings_t* s
                 status->state = STATE_IDLE;
             }
             else {
-                user_input_signed(&set->val.temp_offset);
+                user_input_signed((int16_t*)(&set->val.temp_offset));
             }
 
             // Event Handler
@@ -367,7 +357,7 @@ void display_process(therm_settings_t* s
                 status->state = STATE_IDLE;
             }
             else {
-                user_input(&set->val.setpoint_brew);
+                user_input((uint16_t*)&set->val.setpoint_brew);
             }
 
             // Event Handler
@@ -393,7 +383,7 @@ void display_process(therm_settings_t* s
                 status->state = STATE_IDLE;
             }
             else {
-                user_input(&set->val.setpoint_brew);
+                user_input((uint16_t*)&set->val.setpoint_brew);
             }
 
             // Event Handler