diff --git a/embedded/lib/Component/Screen.cpp b/embedded/lib/Component/Screen.cpp
index 3461053..006731e 100644
--- a/embedded/lib/Component/Screen.cpp
+++ b/embedded/lib/Component/Screen.cpp
@@ -21,8 +21,8 @@ void Screen::Setup(uint8_t *font)
   _font = font;
   _screen->setFont(_font);
 
-    // Static Components
-  connectingWindow.Add(TextBox("connect",StyleWidth::CENTERED, U8G2_BTN_BW0));
+  // Static Components
+  connectingWindow.Add(TextBox("connect", StyleWidth::CENTERED, U8G2_BTN_BW0));
   connectedWindow.Add({TextBox("Connected to Wi-Fi !", StyleWidth::LEFT, U8G2_BTN_BW0),
                        TextBox("IP address: ", StyleWidth::LEFT, U8G2_BTN_BW0),
                        TextBox("addr", StyleWidth::CENTERED, U8G2_BTN_BW0)});
@@ -46,20 +46,22 @@ void Screen::connecting(uint8_t state)
   strncpy(connectText, "Connecting", connectSize);
   size_t currentLength = strlen(connectText);
 
-for (uint8_t i = 0; i < state; i++) {
+  for (uint8_t i = 0; i < state; i++)
+  {
     // Checking space
-    if (currentLength+1 < connectSize) {
-        strncat(connectText, ".", currentLength+1);
-        currentLength += 1;
+    if (currentLength + 1 < connectSize)
+    {
+      strncat(connectText, ".", currentLength + 1);
+      currentLength += 1;
     }
-}
+  }
 
   // Displaying connecting text and setup bar.
   _screen->clearBuffer();
   const auto setupPadding = setupHeader();
 
   // Reactive Component
-  connectingWindow.Update(0,connectText);
+  connectingWindow.Update(0, connectText);
   // Displaying
   connectingWindow.Display(StyleHeight::CENTERED, setupPadding);
   _screen->sendBuffer();
@@ -72,9 +74,9 @@ void Screen::connected(const char *ipaddress)
   const auto setupPadding = setupHeader();
 
   // Reactive Component
-  connectedWindow.Update(2,ipaddress);
+  connectedWindow.Update(2, ipaddress);
   // Displaying
-  connectedWindow.Display(StyleHeight::CENTERED, setupPadding+5);
+  connectedWindow.Display(StyleHeight::CENTERED, setupPadding + 5, 2);
   _screen->sendBuffer();
 }
 
diff --git a/embedded/lib/Component/ScreenComponents.cpp b/embedded/lib/Component/ScreenComponents.cpp
index 4bead11..917a4a4 100644
--- a/embedded/lib/Component/ScreenComponents.cpp
+++ b/embedded/lib/Component/ScreenComponents.cpp
@@ -26,7 +26,7 @@ void Components::Update(size_t index, String text)
     _boxes[index].updateString(text);
 }
 
-void Components::Display(StyleHeight sh, uint16_t offset)
+void Components::Display(StyleHeight sh, uint16_t offset, uint16_t padding)
 {
     const auto totalTextSize = _boxes.size() * FONT_SIZE;
     const auto centeredOffset = (Screen::GetInstance().getHeight() - totalTextSize) - offset;
@@ -35,13 +35,13 @@ void Components::Display(StyleHeight sh, uint16_t offset)
         switch (sh)
         {
         case StyleHeight::TOP:
-            Screen::GetInstance().getScreen().drawButtonUTF8(_boxes[i].getX(), (i * FONT_SIZE) + offset, _boxes[i].getStyle(), _boxes[i].getTextWidth(), 0, 0, _boxes[i].getString());
+            Screen::GetInstance().getScreen().drawButtonUTF8(_boxes[i].getX()+padding*i, (i * FONT_SIZE)+offset+padding*i, _boxes[i].getStyle(), _boxes[i].getTextWidth(), padding, padding, _boxes[i].getString());
             break;
         case StyleHeight::CENTERED:
-            Screen::GetInstance().getScreen().drawButtonUTF8(_boxes[i].getX(), ((centeredOffset / 2) + i * FONT_SIZE) + offset, _boxes[i].getStyle(), _boxes[i].getTextWidth(), 0, 0, _boxes[i].getString());
+            Screen::GetInstance().getScreen().drawButtonUTF8(_boxes[i].getX()+padding*i, ((centeredOffset / 2)+i*FONT_SIZE)+offset+padding*i, _boxes[i].getStyle(), _boxes[i].getTextWidth(), padding, padding, _boxes[i].getString());
             break;
         case StyleHeight::BOTTOM:
-            Screen::GetInstance().getScreen().drawButtonUTF8(_boxes[i].getX(), (centeredOffset + i * FONT_SIZE) + offset, _boxes[i].getStyle(), _boxes[i].getTextWidth(), 0, 0, _boxes[i].getString());
+            Screen::GetInstance().getScreen().drawButtonUTF8(_boxes[i].getX()+padding*i, (centeredOffset + i * FONT_SIZE)+offset+padding*i, _boxes[i].getStyle(), _boxes[i].getTextWidth(), padding, padding, _boxes[i].getString());
             break;
         }
     }
diff --git a/embedded/lib/Component/ScreenComponents.hpp b/embedded/lib/Component/ScreenComponents.hpp
index bf38f38..a783588 100644
--- a/embedded/lib/Component/ScreenComponents.hpp
+++ b/embedded/lib/Component/ScreenComponents.hpp
@@ -49,7 +49,7 @@ namespace Display
         void Add(TextBox box);
         void Add(std::vector<TextBox> boxes);
         void Update(size_t index, String text);
-        void Display(StyleHeight sh=StyleHeight::TOP, uint16_t offset=0);
+        void Display(StyleHeight sh=StyleHeight::TOP, uint16_t offset=0, uint16_t padding=0);
     private:
         // Boxes
         std::vector<TextBox> _boxes;