diff --git a/code/main.c b/code/main.c
index 526c71b..842db36 100644
--- a/code/main.c
+++ b/code/main.c
@@ -120,7 +120,7 @@ int main(void){
     DDRC |= 1<<1;
     PORTB &= ~(1<<VF_BACK_PVW_TALLY_PIN);
 
-    _delay_ms(1000);
+    _delay_ms(500);
     lcd_clear();
 
     PORTB &= ~(1<<VF_FRONT_PGM_TALLY_PIN);
@@ -184,26 +184,23 @@ int main(void){
 	    lcd_printf("front: %d pvw: %d", menu.settings.front_enabled, menu.settings.pvw_enabled);
 
 	    switch(menu_state){
-		case 0:
-		    lcd_disable_cursor();
-		    lcd_disable_blinking();
-		    break;
 		case 1:
 		    lcd_set_cursor(5,0);
-		    lcd_enable_cursor();
-		    lcd_enable_blinking();
 		    break;
 		case 2:
 		    lcd_set_cursor(7, 1);
-		    lcd_enable_cursor();
-		    lcd_enable_blinking();
 		    break;
 		case 3:
 		    lcd_set_cursor(14,1);
-		    lcd_enable_cursor();
-		    lcd_enable_blinking();
 		    break;
 	    }
+	    if(menu_state){
+		lcd_enable_cursor();
+		lcd_enable_blinking();
+	    }else{
+		lcd_disable_cursor();
+		lcd_disable_blinking();
+	    }
 	}
 	_delay_ms(10);
     }