diff --git a/Platformio/HAL/HardwareModules/KeyPressAbstract.hpp b/Platformio/HAL/HardwareModules/KeyPressAbstract.hpp
index 6d73ac4..8b6e022 100644
--- a/Platformio/HAL/HardwareModules/KeyPressAbstract.hpp
+++ b/Platformio/HAL/HardwareModules/KeyPressAbstract.hpp
@@ -1,6 +1,5 @@
 #pragma once
 #include "Notification.hpp"
-#include "SPSCQueueInterface.hpp"
 
 #include <memory>
 class KeyPressAbstract {
diff --git a/Platformio/HAL/Targets/Simulator/KeyPressSim.cpp b/Platformio/HAL/Targets/Simulator/KeyPressSim.cpp
index a2cb19a..12a9ac6 100644
--- a/Platformio/HAL/Targets/Simulator/KeyPressSim.cpp
+++ b/Platformio/HAL/Targets/Simulator/KeyPressSim.cpp
@@ -1,5 +1,4 @@
 #include "KeyPressSim.hpp"
-#include "SimulatorSPSCQueue.hpp"
 
 #include <memory>
 
diff --git a/Platformio/HAL/Targets/Simulator/SimulatorSPSCQueue.cpp b/Platformio/HAL/Targets/Simulator/SimulatorSPSCQueue.cpp
index 4f8bcd2..a78eee4 100644
--- a/Platformio/HAL/Targets/Simulator/SimulatorSPSCQueue.cpp
+++ b/Platformio/HAL/Targets/Simulator/SimulatorSPSCQueue.cpp
@@ -4,7 +4,7 @@ template <typename T>
 SimulatorSPSCQueue<T>::SimulatorSPSCQueue(uint32_t size)
 {
     this->size = size;
-    this->data = new T[](this->size + 1);
+    this->data = new T[this->size + 1];
     this->rd_index = 0;
     this->wr_index = 0;
 }
diff --git a/Platformio/OmoteUI/core/page/SettingsPage.hpp b/Platformio/OmoteUI/core/page/SettingsPage.hpp
index 6908b26..dc7e757 100644
--- a/Platformio/OmoteUI/core/page/SettingsPage.hpp
+++ b/Platformio/OmoteUI/core/page/SettingsPage.hpp
@@ -1,6 +1,9 @@
 #include "HardwareAbstract.hpp"
 #include "PageBase.hpp"
 
+namespace UI::Widget{
+  class Button;
+}
 namespace UI::Page {
 class SettingsPage : public Base {
 public:
@@ -16,7 +19,7 @@ protected:
   void OnHide() override{};
 
   std::vector<UIElement *> sliders;
-  Widget::Base *mButton;
+  Widget::Button *mButton;
   std::shared_ptr<HardwareAbstract> mHardware;
 };
 } // namespace UI::Page
diff --git a/Platformio/OmoteUI/core/screen/HomeScreen.cpp b/Platformio/OmoteUI/core/screen/HomeScreen.cpp
index d8fdd61..d667a76 100644
--- a/Platformio/OmoteUI/core/screen/HomeScreen.cpp
+++ b/Platformio/OmoteUI/core/screen/HomeScreen.cpp
@@ -6,12 +6,13 @@ using namespace UI::Screen;
 
 HomeScreen::HomeScreen(std::shared_ptr<HardwareAbstract> aHardware)
     : Base(UI::ID::Screens::Home), mHardware(aHardware) {
-  SetBgColor(UI::Color::BLACK);
-  SetPushAnimation(LV_SCR_LOAD_ANIM_FADE_IN);
 
   mTabView = AddElement<Page::TabView>(std::make_unique<Page::TabView>(
       ID(ID::Pages::INVALID_PAGE_ID))); // Adds Tabview to Homescreen
 
+  SetBgColor(UI::Color::BLACK);
+  SetPushAnimation(LV_SCR_LOAD_ANIM_FADE_IN);
+
   // Adds pages to the Tab view
   mTabView->AddTab(std::make_unique<Page::SettingsPage>(aHardware), "Settings");
   mTabView->AddTab(std::make_unique<Page::SettingsPage>(aHardware),
diff --git a/Platformio/platformio.ini b/Platformio/platformio.ini
index 64f0eb0..ece393b 100644
--- a/Platformio/platformio.ini
+++ b/Platformio/platformio.ini
@@ -129,11 +129,12 @@ build_flags =
   ;-D LV_LOG_LEVEL=LV_LOG_LEVEL_INFO
   ;-D LV_LOG_PRINTF=1
   -lSDL2 ; SDL2 must be installed on system! Windows:msys2 ubuntu:apt-get
+  -lpthread ; std::thread for Linux
   ; --------- SDL drivers options -----------------------------
   -D LV_LVGL_H_INCLUDE_SIMPLE
   -D LV_DRV_NO_CONF
   -D USE_SDL
-  -D SDL_MAIN_HANDLED 
+  -D SDL_MAIN_HANDLED
   -D SDL_HOR_RES=SCREEN_WIDTH
   -D SDL_VER_RES=SCREEN_HEIGHT
   -D SDL_ZOOM=1