   // Draw screen frame etc
   drawScannerScreen();
 
-  while ((clickType = getClickType(BUTTON_PIN)) == NO_CLICK) {
+  while (digitalRead(BUTTON_PIN) != BUTTON_PRESSED) {
     scanFrequency += SCANNING_STEP;
     if (scanFrequency > FREQUENCY_MAX)
       scanFrequency = FREQUENCY_MIN;

    }
  }
  // Fine tuning
  scanFrequency = bestFrequency - 20;
  bestRssi = 0;
  for (i = 0; i < 20; i++, scanFrequency += 2) {
    receiver.setFrequency(scanFrequency);
    delay( RSSI_STABILITY_DELAY_MS );
    scanRssi = averageAnalogRead(RSSI_PIN);

    updateScannerScreen(100 - ((FREQUENCY_MAX - scanFrequency) / SCANNING_STEP), rssiDisplayValue );
  }
  // Fine tuning
  scanFrequency = scanFrequency - SCANNING_STEP * 4;
  for (i = 0; i < SCANNING_STEP * 4; i++, scanFrequency += 2) {
    receiver.setFrequency(scanFrequency);
    delay( RSSI_STABILITY_DELAY_MS );
    scanRssi = averageAnalogRead(RSSI_PIN);
