 //******************************************************************************
 void drawScannerScreen( void ) {
   display.clearDisplay();
-  display.drawLine(0, 56, 127, 56, WHITE);
-  display.drawLine(101, 0, 101, 55, WHITE);
+  display.drawLine(0, 55, 127, 55, WHITE);
   updateScannerScreen(0, 0);
 }
 
 //******************************************************************************
 //* function: updateScannerScreen
 //*         : position = 0 to 99
-//*         : value = 0 to 55
+//*         : value = 0 to 53
 //******************************************************************************
 void updateScannerScreen(uint8_t position, uint8_t value ) {
-  static uint8_t errase_position = 0;
-  static uint8_t errase_value = 0;
+  uint8_t i;
+  static uint8_t errase_position = 14;
+  static uint8_t errase_value = 53;
+  position = position + 14;
   display.drawLine( errase_position, 0, errase_position, errase_value, BLACK );
-  display.fillRect(0, 57, 128, 7, BLACK);
+  display.drawLine( errase_position, errase_value + 1, errase_position, 53, WHITE );
+  display.fillRect(0, 56, 128, 8, BLACK);
   display.setTextColor(WHITE);
   display.setTextSize(1);
-  display.setCursor(0, 55);
-  display.print("5.645   5.800   5.945");
-  display.drawLine( position,      0, position,     63, WHITE );
+  display.setCursor(0, 57);
+  display.print("5.65     5.8     5.95");
+  for ( i = 0; i < 12; i++) {
+    display.drawLine( position, i * 4, position, i * 4 + 1, WHITE );
+    display.drawLine( position, i * 4 + 2, position, i * 4 + 3,  BLACK );
+  }
+  display.drawLine( position    , 55, position    , 63, WHITE );
   display.drawLine( position - 1, 58, position - 1, 63, WHITE );
   display.drawLine( position + 1, 58, position + 1, 63, WHITE );
   display.drawLine( position - 2, 60, position - 2, 63, WHITE );
   display.drawLine( position + 2, 60, position + 2, 63, WHITE );
   display.drawLine( position - 3, 62, position - 3, 63, WHITE );
   display.drawLine( position + 3, 62, position + 3, 63, WHITE );
+
   errase_position = position;
-  if (value > 55)
-    value = 55;
-  errase_value = 55 - value;
+  if (value > 53)
+    value = 53;
+  errase_value = 53 - value;
   display.display();
 }
 

//******************************************************************************
//* function: graphicScanner
//*         : scans the 5.8 GHz band in 3 MHz increments and draws a graphical
//*         : representation. If the button is single pressed the currently
//*         : scanned frequency is returned. All other click types return the
//*         : scan start frequency
//******************************************************************************
uint16_t graphicScanner( uint16_t frequency ) {
  uint8_t i;

    setRTC6715Frequency(scanFrequency);
    delay( RSSI_STABILITY_DELAY_MS );
    scanRssi = readRssi();
    rssiDisplayValue = (scanRssi - 140) / 10;    // Roughly 2 - 46
    updateScannerScreen(100 - ((FREQUENCY_MAX - scanFrequency) / 3), rssiDisplayValue );
  }
  // Fine tuning
  scanFrequency = scanFrequency - 20;
  for (i = 0; i < 20; i++, scanFrequency += 2) {
    setRTC6715Frequency(scanFrequency);
    delay( RSSI_STABILITY_DELAY_MS );
