 // Draw the basic screen
 //-----------------------------------------------
 
-#if 0
 void drawOnline(void)
 {
-  tft.fillRoundRect(ONLINE_X, ONLINE_Y, ONLINE_WIDTH, ONLINE_HEIGHT, BUTTON_RADIUS, ONLINE_BG);
-  tft.setCursor(ONLINE_X + 2, ONLINE_Y + 2);
-  tft.print("ONLINE");
+  if (vfo_state == VFO_Standby)
+  {
+    tft.fillRoundRect(ONLINE_X, ONLINE_Y, ONLINE_WIDTH, ONLINE_HEIGHT, BUTTON_RADIUS, STANDBY_BG2);
+    tft.fillRoundRect(ONLINE_X+1, ONLINE_Y+1, ONLINE_WIDTH-2, ONLINE_HEIGHT-2, BUTTON_RADIUS, STANDBY_BG);
+    tft.setCursor(ONLINE_X + 7, SCREEN_HEIGHT - 10);
+    tft.setFont(FONT_BUTTON);
+    tft.setTextColor(ONLINE_FG);
+    tft.print("Standby");
+  }
+  else
+  {
+    tft.fillRoundRect(ONLINE_X, ONLINE_Y, ONLINE_WIDTH, ONLINE_HEIGHT, BUTTON_RADIUS, ONLINE_BG2);
+    tft.fillRoundRect(ONLINE_X+1, ONLINE_Y+1, ONLINE_WIDTH-2, ONLINE_HEIGHT-2, BUTTON_RADIUS, ONLINE_BG);
+    tft.setCursor(ONLINE_X + 7, SCREEN_HEIGHT - 10);
+    tft.setFont(FONT_BUTTON);
+    tft.setTextColor(ONLINE_FG);
+    tft.print("ONLINE");
+  }
 }
 
 void drawMenu(void)
 {
-  tft.fillRoundRect(MENU_X, MENU_Y, MENU_WIDTH, MENU_HEIGHT, BUTTON_RADIUS, MENU_BG);
-  tft.setCursor(MENU_X + 2, MENU_Y + 2);
-  tft.print("MENU");
-}
-#endif
+  tft.fillRoundRect(MENU_X, MENU_Y, MENU_WIDTH, MENU_HEIGHT, BUTTON_RADIUS, MENU_BG2);
+  tft.fillRoundRect(MENU_X+1, MENU_Y+1, MENU_WIDTH-2, MENU_HEIGHT-2, BUTTON_RADIUS, MENU_BG);
+  tft.setCursor(MENU_X + 22, SCREEN_HEIGHT - 10);
+  tft.setFont(FONT_BUTTON);
+  tft.setTextColor(MENU_FG);
+  tft.print("Menu");
+}
 
 void draw_screen(void)
 {
+  tft.setFont(FONT_FREQ);
+
   // start drawing things that don't change
   tft.fillScreen(SCREEN_BG2);
   tft.setTextWrap(false);
-  tft.fillRect(0, 0, tft.width(), DEPTH_FREQ_DISPLAY, FREQ_BG);
-#if 0
-  tft.drawRect(0, 0, tft.width(), DEPTH_FREQ_DISPLAY, SCREEN_BG1);
-  tft.drawRect(1, 1, tft.width()-2, DEPTH_FREQ_DISPLAY-2, SCREEN_BG2);
-  tft.drawRect(2, 2, tft.width()-4, DEPTH_FREQ_DISPLAY-4, SCREEN_BG3);
-#endif
+//  tft.fillRect(0, 0, tft.width(), DEPTH_FREQ_DISPLAY, FREQ_BG);
+  tft.fillRoundRect(0, 0, tft.width(), DEPTH_FREQ_DISPLAY, 5, FREQ_BG);
   tft.setCursor(MHZ_OFFSET_X, FREQ_OFFSET_Y);
   tft.setTextColor(FREQ_FG);
   tft.print("Hz");
 
-//  drawOnline();
-//  drawMenu();
+  drawOnline();
+  drawMenu();
 }
 
 //-----------------------------------------------

  SPI.begin();
  
  tft.begin();
  tft.setFont(&ArialBold24pt7b);
  tft.setRotation(1);

  ts.begin();
  ts_setRotation(1);
  
  // draw the basic screen
  draw_screen();

{
  bool leading_space = true;

  tft.setFont(FONT_FREQ);
  
  for (int i = 0; i < NUM_F_CHAR; ++i)
  {
    if (i == select)
