diff --git a/radio/src/gui/colorlcd/radio_hardware.cpp b/radio/src/gui/colorlcd/radio_hardware.cpp
index 9010d0234..139db90a9 100644
--- a/radio/src/gui/colorlcd/radio_hardware.cpp
+++ b/radio/src/gui/colorlcd/radio_hardware.cpp
@@ -32,34 +32,7 @@
 #define SWITCH_TYPE_MAX(sw)            (SWITCH_3POS)
 #endif
 
-class RTCBattValue: public Window
-{
-  public:
-    RTCBattValue(Window * parent, const rect_t & rect):
-      Window(parent, rect)
-    {
-    }
-
-    void paint(BitmapBuffer * dc) override
-    {
-      dc->drawNumber(0, 0, getRTCBatteryVoltage(), PREC2, 2, "", "V");
-    }
-
-    void checkEvents() override
-    {
-      if (lastValue != getRTCBatteryVoltage()) {
-        lastValue = getRTCBatteryVoltage();
-        invalidate();
-      }
-
-      Window::checkEvents();
-    }
-
-  protected:
-    uint16_t lastValue;
-};
-
-class SwitchDynamicLabel : public StaticText {
+class SwitchDynamicLabel: public StaticText {
   public:
     SwitchDynamicLabel(Window * parent, const rect_t & rect, uint8_t index):
       StaticText(parent, rect),
@@ -176,15 +149,16 @@ void RadioHardwarePage::build(FormWindow * window)
   new StaticText(window, grid.getLabelSlot(), STR_BATT_CALIB);
   auto batCal = new NumberEdit(window, grid.getFieldSlot(), -127, 127, GET_SET_DEFAULT(g_eeGeneral.txVoltageCalibration));
   batCal->setDisplayHandler([](BitmapBuffer * dc, LcdFlags flags, int32_t value) {
-      dc->drawNumber(2, 0, getBatteryVoltage(), flags | PREC2, 0, nullptr, "V");
+      dc->drawNumber(FIELD_PADDING_LEFT, FIELD_PADDING_TOP, getBatteryVoltage(), flags | PREC2, 0, nullptr, "V");
   });
   batCal->setWindowFlags(REFRESH_ALWAYS);
   grid.nextLine();
 
   // RTC Batt display
   new StaticText(window, grid.getLabelSlot(), STR_RTC_BATT);
-
-  new RTCBattValue(window, grid.getFieldSlot());
+  new DynamicNumber<uint16_t>(window, grid.getFieldSlot(), [] {
+      return getRTCBatteryVoltage();
+  }, PREC2, nullptr, "V");
   grid.nextLine();
 
   // RTC Batt check enable
diff --git a/radio/src/gui/colorlcd/radio_spectrum_analyser.cpp b/radio/src/gui/colorlcd/radio_spectrum_analyser.cpp
index bae40e956..95fb5e41a 100644
--- a/radio/src/gui/colorlcd/radio_spectrum_analyser.cpp
+++ b/radio/src/gui/colorlcd/radio_spectrum_analyser.cpp
@@ -58,11 +58,11 @@ class SpectrumFooterWindow: public FormGroup
         char label[10];
 
         // Frequency
-        sprintf(label,"T:%dMHz", reusableBuffer.spectrumAnalyser.freq / 1000000);
+        sprintf(label,"T: %dMHz", reusableBuffer.spectrumAnalyser.freq / 1000000);
         new StaticText(this, grid.getFieldSlot(3, 0), label);
 
         // Span
-        sprintf(label,"S:%dMHz", reusableBuffer.spectrumAnalyser.span / 1000000);
+        sprintf(label,"S: %dMHz", reusableBuffer.spectrumAnalyser.span / 1000000);
         new StaticText(this, grid.getFieldSlot(3, 1), label);
       }
       else {
diff --git a/radio/src/strhelpers.h b/radio/src/strhelpers.h
index 34429aaa6..3cdd33a86 100644
--- a/radio/src/strhelpers.h
+++ b/radio/src/strhelpers.h
@@ -24,8 +24,8 @@
 #include "opentx_types.h"
 
 char * strAppend(char * dest, const char * source, int len = 0);
-char * strAppendUnsigned(char * dest, uint32_t value, uint8_t digits=0, uint8_t radix=10);
-char * strAppendSigned(char * dest, int32_t value, uint8_t digits=0, uint8_t radix=10);
+char * strAppendUnsigned(char * dest, uint32_t value, uint8_t digits = 0, uint8_t radix = 10);
+char * strAppendSigned(char * dest, int32_t value, uint8_t digits = 0, uint8_t radix = 10);
 char * strSetCursor(char * dest, int position);
 char * strAppendDate(char * str, bool time=false);
 char * strAppendFilename(char * dest, const char * filename, const int size);