diff --git a/GNC255/GNC255.cpp b/GNC255/GNC255.cpp
index ddb2af0..f9521ee 100644
--- a/GNC255/GNC255.cpp
+++ b/GNC255/GNC255.cpp
@@ -2,13 +2,14 @@
 #include <U8g2lib.h>
 #include "allocateMem.h"
 #include "commandmessenger.h"
+#include "fonts.h"
 
 Layout ComLayout = {
-    {u8g2_font_logisoso22_tn, 22, {10, 32}},
-    {u8g2_font_profont10_mr, 10, {0, 32}},
-    {u8g2_font_profont12_mr, 13, {18, 45}},
-    {u8g2_font_profont12_mr, 12, {107, 18}},
-    {u8g2_font_profont12_mr, 12, {120, 18}},
+    {gnc255frequency, 22, {31, 35}}, /* Value (frequency)*/
+    {u8g2_font_4x6_mr, 6, {19, 32}}, /* ValueLabel (ACT/STB) */
+    {u8g2_font_profont12_mr, 13, {33, 48}}, /* Valuelabel (active or standby label) */
+    {u8g2_font_profont12_mr, 12, {116, 24}}, /* ModeComLabel (COM mode indicator) */
+    {u8g2_font_profont12_mr, 12, {127, 24}}, /* ModeNavLabel (NAV mode indicator) */
 };
 
 Position OffsetActive = {
@@ -16,7 +17,7 @@ Position OffsetActive = {
     0};
 
 Position OffsetStandby = {
-    140,
+    116,
     0};
 
 GNC255::GNC255(uint8_t clk, uint8_t data, uint8_t cs, uint8_t dc, uint8_t reset)
diff --git a/GNC255/fonts.h b/GNC255/fonts.h
new file mode 100644
index 0000000..a9d56e5
--- /dev/null
+++ b/GNC255/fonts.h
@@ -0,0 +1,16 @@
+/*
+  Fontname: gnc255frequency
+  Copyright: Created with Fony 1.4.7
+  Glyphs: 12/12
+  BBX Build Mode: 0
+*/
+const uint8_t gnc255frequency[226] U8G2_FONT_SECTION("gnc255frequency") =
+  "\14\0\4\4\4\5\2\6\5\13\22\0\2\24\0\24\0\0\0\0\0\0\311.\6\63\24+$/\5\0"
+  "\244;\60\17+\25\273\234I\341\312\376W.\322\34\1\61\14)\27{\224\261l\376o\36\60\62\21+"
+  "\25\273\234I\341j\340t\363\207\3\37<\30\63\25+\25\273\234I\341j\340l\16]\71pBS."
+  "\322\34\1\64\33+\25\273\215#V\312\320\210\61C\246\31\62f\310\230!\17\36\14\33\70O\0\65\23"
+  "+\25;|`p\206IT,\234\241)\27i\216\0\66\24+\25\273 I\241b\340\14\223\250pe"
+  "W.\322\34\1\67\21+\25;|\60pv\304(\33\67p~\5\0\70\25+\25\273\234I\341\312V"
+  "#\222d\61\312\256\134\244\71\2\0\71\23+\25\273\234I\341\312\256\134(I\70\27*\222 \1\0\0"
+  "\0";
+