diff --git a/src/audio/tone_generator.cpp b/src/audio/tone_generator.cpp
index aba821c..9bd4a89 100644
--- a/src/audio/tone_generator.cpp
+++ b/src/audio/tone_generator.cpp
@@ -1,7 +1,6 @@
 #include <Arduino.h>
 
 #include <input/encoder.hpp>
-#include <ui/display.hpp>
 #include <audio/tone_generator.hpp>
 
 #ifndef ANALAOG_OUTPUT_PIN
@@ -53,8 +52,6 @@ namespace ToneGenerator
         setFrequency(frequency);
         Serial.print("Frequency: ");
         Serial.println(frequency);
-
-        Display::setLabelText("Frequency: " + String(frequency) + "Hz");
     }
 
     void setToneOn(bool on)
diff --git a/src/main.cpp b/src/main.cpp
index 6abcd33..cf3bf23 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -28,7 +28,6 @@ void setup()
   ToneGenerator::init();
 
   Serial.println("setup complete");
-  Display::setLabelText("Boot complete.");
 }
 
 void loop()
diff --git a/src/ui/display.cpp b/src/ui/display.cpp
index e61c45b..0c677d6 100644
--- a/src/ui/display.cpp
+++ b/src/ui/display.cpp
@@ -4,6 +4,7 @@
 #include <Arduino.h>
 
 #include <input/encoder.hpp>
+#include <ui/views/main_view.hpp>
 
 #ifndef SCREEN_WIDTH
 #define SCREEN_WIDTH 320
@@ -16,16 +17,17 @@
 #define DRAW_BUF_SIZE (SCREEN_WIDTH * SCREEN_HEIGHT / 10 * (LV_COLOR_DEPTH / 8))
 namespace Display
 {
+  const uint8_t MAIN_VIEW = 1;
+
   uint32_t draw_buf[DRAW_BUF_SIZE / 4];
 
   uint32_t getTime();
   void handleLvglLogs(lv_log_level_t level, const char *buf);
   void handleUpdateValues(lv_timer_t *timer);
-  void handleEnterButton();
+  void setCurrentView(uint8_t view);
 
-  String label_text;
-  lv_obj_t *label;
   lv_timer_t *update_values_timer;
+  uint8_t current_view = 0;
 
   void init()
   {
@@ -39,11 +41,8 @@ namespace Display
     lv_display_t *display;
     display = lv_tft_espi_create(SCREEN_HEIGHT, SCREEN_WIDTH, draw_buf, sizeof(draw_buf));
     lv_display_set_rotation(display, LV_DISPLAY_ROTATION_90);
-
-    label = lv_label_create(lv_screen_active());
-    lv_obj_align(label, LV_ALIGN_CENTER, 0, 0);
-
-    Encoder::onButtonRelease(handleEnterButton);
+    
+    setCurrentView(MAIN_VIEW);
   }
 
   void update()
@@ -51,11 +50,6 @@ namespace Display
     lv_timer_handler();
   }
 
-  void setLabelText(String text)
-  {
-    label_text = text;
-  }
-
   void handleLvglLogs(lv_log_level_t level, const char *buf)
   {
     Serial.printf("LVGL: %s\r\n", buf);
@@ -65,17 +59,25 @@ namespace Display
   {
     return esp_timer_get_time() / 1000;
   }
-
-  void handleUpdateValues(lv_timer_t *timer)
-  {
-    if (label != NULL && lv_label_get_text(label) != label_text.c_str())
-    {
-      lv_label_set_text(label, label_text.c_str());
+  
+  void setCurrentView(uint8_t view) {
+    current_view = view;
+    lv_obj_t *parent = lv_screen_active();
+    lv_obj_clean(parent);
+    switch(view) {
+      case MAIN_VIEW:
+        MainView::render(parent);
+        break;
     }
   }
 
-  void handleEnterButton()
+  void handleUpdateValues(lv_timer_t *timer)
   {
-    setLabelText("Button pressed.");
+    switch (current_view)
+    {
+    case MAIN_VIEW:
+      MainView::update();
+      break;
+    }
   }
 }
diff --git a/src/ui/display.hpp b/src/ui/display.hpp
index 5de0b81..6a400ee 100644
--- a/src/ui/display.hpp
+++ b/src/ui/display.hpp
@@ -4,7 +4,6 @@
 namespace Display {
     void init();
     void update();
-    void setLabelText(String text);
 }
 
 #endif // DRUMZ_UI_DISPLAY_HPP
\ No newline at end of file
diff --git a/src/ui/views/main_view.cpp b/src/ui/views/main_view.cpp
new file mode 100644
index 0000000..60bcd70
--- /dev/null
+++ b/src/ui/views/main_view.cpp
@@ -0,0 +1,41 @@
+#include <Arduino.h>
+#include <lvgl.h>
+
+#include <input/encoder.hpp>
+#include <audio/tone_generator.hpp>
+
+namespace MainView
+{
+  void handleEnterButton();
+
+  lv_obj_t *label;
+  String label_text;
+  int frequency = ToneGenerator::getFrequency();
+
+  void render(lv_obj_t *parent)
+  {
+    label = lv_label_create(lv_screen_active());
+    lv_obj_align(label, LV_ALIGN_CENTER, 0, 0);
+    label_text = "Main view initialized.";
+
+    Encoder::onButtonPress(handleEnterButton);
+  }
+
+  void update()
+  {
+    if (frequency != ToneGenerator::getFrequency())
+    {
+      frequency = ToneGenerator::getFrequency();
+      label_text = "Frequency: " + String(frequency) + "Hz";
+    }
+    if (label != NULL && lv_label_get_text(label) != label_text.c_str())
+    {
+      lv_label_set_text(label, label_text.c_str());
+    }
+  }
+
+  void handleEnterButton()
+  {
+    label_text = "Button pressed.";
+  }
+}
\ No newline at end of file
diff --git a/src/ui/views/main_view.hpp b/src/ui/views/main_view.hpp
new file mode 100644
index 0000000..ed48713
--- /dev/null
+++ b/src/ui/views/main_view.hpp
@@ -0,0 +1,12 @@
+#include <lvgl.h>
+
+#ifndef DRUMZ_UI_VIEWS_MAIN_VIEW_HPP
+#define DRUMZ_UI_VIEWS_MAIN_VIEW_HPP
+
+namespace MainView
+{
+    void render(lv_obj_t *parent);
+    void update();
+}
+
+#endif // DRUMZ_UI_VIEWS_MAIN_VIEW_HPP
\ No newline at end of file