diff --git a/ui.cpp b/ui.cpp
index 152fee8..47809e8 100644
--- a/ui.cpp
+++ b/ui.cpp
@@ -2200,9 +2200,9 @@ static void draw_numeric_area_frame ( void )
 {
 	tft.fillRect ( 0, 208, 256, 32, WHITE );			// White background
 
-	DrawString ( keypad_mode_label[keypad_mode], 10, 220, BLACK, 1 );
-	tft.setCursor(0,230);
-	tft.printf("%i",uistat.previous_value);
+	DrawString ( keypad_mode_label[keypad_mode], 5, 220, BLACK, 1 );
+	tft.setCursor(5,230);
+	tft.printf("%.0f",uistat.previous_value);
 }
 
 
@@ -2224,7 +2224,7 @@ static void draw_numeric_area_frame ( void )
 static void draw_numeric_input ( const char *buf )
 {
 	int		i      =  0;						// Buffer index
-	int		x      = 58;						// 'X' coordinate for first character
+	int		x      = 64;						// 'X' coordinate for first character
 	int		nextX  = 20;						// Normal character spacing
 	bool	sawDot = false;						// True if decimal entered
 	uint8_t	digits = 0;							// Digit counter
@@ -2925,7 +2925,7 @@ static int keypad_click ( int key )
 								    NULL );
 				}
 				else
-					trackGenSetting.Offset = value;
+					SetTGOffset ( (int32_t)value );
 				break;
 
 			case KM_TGIF_DRIVE:
@@ -2938,7 +2938,7 @@ static int keypad_click ( int key )
 								    NULL );
 				}
 				else
-					trackGenSetting.IF_Drive = value;
+					SetTGIfDrive ( (uint8_t)value );
 				break;
 
 			case KM_TGLO_DRIVE:
@@ -2951,7 +2951,7 @@ static int keypad_click ( int key )
 								    NULL );
 				}
 				else
-					trackGenSetting.LO_Drive = value;
+					SetTGLoDrive ( (uint8_t)value );
 				break;