diff --git a/assets/default_theme.theme b/assets/default_theme.theme
index e8fb9a5..bd50a7f 100644
Binary files a/assets/default_theme.theme and b/assets/default_theme.theme differ
diff --git a/ui/composed_ui.tscn b/ui/composed_ui.tscn
index 6f70e37..1a068c1 100644
--- a/ui/composed_ui.tscn
+++ b/ui/composed_ui.tscn
@@ -22,31 +22,48 @@ margin_bottom = 755.0
 [node name="VBoxContainerPrimary" type="VBoxContainer" parent="VBoxContainer"]
 unique_name_in_owner = true
 margin_right = 350.0
-margin_bottom = 187.0
+margin_bottom = 142.0
 
 [node name="TimeCounter" parent="VBoxContainer/VBoxContainerPrimary" instance=ExtResource( 3 )]
 anchor_right = 0.0
 anchor_bottom = 0.0
 margin_right = 350.0
-margin_bottom = 141.0
+margin_bottom = 142.0
 
-[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/VBoxContainerPrimary"]
-margin_top = 148.0
+[node name="HBoxContainer2" parent="VBoxContainer/VBoxContainerPrimary/TimeCounter" index="0"]
 margin_right = 350.0
-margin_bottom = 187.0
-alignment = 2
+margin_bottom = 40.0
 
-[node name="ToggleTabContainerButton" type="Button" parent="VBoxContainer/VBoxContainerPrimary/HBoxContainer"]
+[node name="ToggleTabContainerButton" type="Button" parent="VBoxContainer/VBoxContainerPrimary/TimeCounter/HBoxContainer2" index="0"]
 unique_name_in_owner = true
-margin_left = 329.0
-margin_right = 350.0
-margin_bottom = 39.0
+margin_right = 40.0
+margin_bottom = 40.0
 theme_type_variation = "panel_toggle_button"
 toggle_mode = true
 
+[node name="TaskNameLineEdit" parent="VBoxContainer/VBoxContainerPrimary/TimeCounter/HBoxContainer2" index="1"]
+margin_left = 48.0
+margin_right = 350.0
+margin_bottom = 40.0
+
+[node name="HBoxContainer" parent="VBoxContainer/VBoxContainerPrimary/TimeCounter" index="1"]
+margin_top = 47.0
+margin_right = 350.0
+margin_bottom = 142.0
+
+[node name="TimeLabel" parent="VBoxContainer/VBoxContainerPrimary/TimeCounter/HBoxContainer" index="0"]
+margin_top = 0.0
+margin_right = 270.0
+margin_bottom = 95.0
+
+[node name="StartButton" parent="VBoxContainer/VBoxContainerPrimary/TimeCounter/HBoxContainer" index="1"]
+margin_left = 278.0
+margin_right = 350.0
+margin_bottom = 95.0
+
 [node name="TabContainer" type="TabContainer" parent="VBoxContainer"]
 unique_name_in_owner = true
-margin_top = 194.0
+margin_top = 149.0
 margin_right = 350.0
 margin_bottom = 750.0
 size_flags_vertical = 3
@@ -73,4 +90,6 @@ size_flags_vertical = 3
 anchor_right = 0.0
 anchor_bottom = 0.0
 margin_right = 342.0
-margin_bottom = 520.0
+margin_bottom = 565.0
+
+[editable path="VBoxContainer/VBoxContainerPrimary/TimeCounter"]
diff --git a/ui/time_counter.tscn b/ui/time_counter.tscn
index 5ced5a3..1a94295 100644
--- a/ui/time_counter.tscn
+++ b/ui/time_counter.tscn
@@ -7,14 +7,19 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 script = ExtResource( 1 )
 
-[node name="TaskNameLineEdit" type="LineEdit" parent="."]
+[node name="HBoxContainer2" type="HBoxContainer" parent="."]
+margin_right = 360.0
+margin_bottom = 45.0
+
+[node name="TaskNameLineEdit" type="LineEdit" parent="HBoxContainer2"]
 unique_name_in_owner = true
 margin_right = 360.0
-margin_bottom = 24.0
+margin_bottom = 45.0
+size_flags_horizontal = 3
 placeholder_text = "Task Name. Use \"/\" to create subtasks"
 
 [node name="HBoxContainer" type="HBoxContainer" parent="."]
-margin_top = 28.0
+margin_top = 53.0
 margin_right = 360.0
 margin_bottom = 760.0
 size_flags_horizontal = 3
@@ -22,9 +27,9 @@ size_flags_vertical = 3
 
 [node name="TimeLabel" type="Label" parent="HBoxContainer"]
 unique_name_in_owner = true
-margin_top = 359.0
-margin_right = 344.0
-margin_bottom = 373.0
+margin_top = 341.0
+margin_right = 328.0
+margin_bottom = 366.0
 size_flags_horizontal = 3
 size_flags_vertical = 6
 theme_type_variation = "time_label"
@@ -34,9 +39,9 @@ valign = 1
 
 [node name="StartButton" type="Button" parent="HBoxContainer"]
 unique_name_in_owner = true
-margin_left = 348.0
+margin_left = 336.0
 margin_right = 360.0
-margin_bottom = 732.0
+margin_bottom = 707.0
 theme_type_variation = "play_button"
 
 [node name="Timer" type="Timer" parent="."]