diff --git a/src/GUIStuff/Elements/RotateWheel.cpp b/src/GUIStuff/Elements/RotateWheel.cpp
index 80fa6b8..801356f 100644
--- a/src/GUIStuff/Elements/RotateWheel.cpp
+++ b/src/GUIStuff/Elements/RotateWheel.cpp
@@ -20,6 +20,7 @@ void RotateWheel::layout(double* rotateAngle, const std::function<void()>& onCha
         .layout = { 
             .sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_GROW(0)}
         },
+        .aspectRatio = {1.0f},
         .custom = { .customData = this }
     }) {
     }
diff --git a/src/GUIStuff/GUIManager.cpp b/src/GUIStuff/GUIManager.cpp
index 7eb96da..86a3412 100644
--- a/src/GUIStuff/GUIManager.cpp
+++ b/src/GUIStuff/GUIManager.cpp
@@ -237,7 +237,7 @@ void GUIManager::set_to_layout() {
 void GUIManager::layout_if_necessary() {
     if(setToLayout) {
         layout();
-        setToLayout = false;
+        setToLayout = true;
     }
 }
 
diff --git a/src/Toolbar.cpp b/src/Toolbar.cpp
index f370d3c..2302748 100644
--- a/src/Toolbar.cpp
+++ b/src/Toolbar.cpp
@@ -667,6 +667,7 @@ void Toolbar::top_toolbar() {
             bool layerMenuPopUpJustOpen = false;
             auto icon_button_top_toolbar = [&](const char* id, const std::string& svgPath, bool isSelected, const std::function<void()>& onClick) {
                 svg_icon_button(gui, id, svgPath, {
+                    .drawType = SelectableButton::DrawType::TRANSPARENT_ALL,
                     .isSelected = isSelected,
                     .onClick = onClick
                 });
@@ -679,6 +680,16 @@ void Toolbar::top_toolbar() {
                     menuPopUpJustOpen = true;
                 }
             });
+
+
+            // Temporary gap between buttons while tab list is being fixed
+            CLAY_AUTO_ID({
+                .layout = {
+                    .sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_FIT(0) },
+                }
+            }) { }
+
+
             //std::vector<std::pair<std::string, std::string>> tabNames;
             //for(size_t i = 0; i < main.worlds.size(); i++) {
             //    auto& w = main.worlds[i];