diff --git a/src/UI/CanvasPreviewContainer/CanvasPreviewContainer.tscn b/src/UI/CanvasPreviewContainer/CanvasPreviewContainer.tscn
index e003d09e7..4a16a0818 100644
--- a/src/UI/CanvasPreviewContainer/CanvasPreviewContainer.tscn
+++ b/src/UI/CanvasPreviewContainer/CanvasPreviewContainer.tscn
@@ -6,7 +6,7 @@
 [ext_resource type="Script" path="res://src/UI/CanvasPreviewContainer/CanvasPreviewContainer.gd" id="4"]
 [ext_resource type="PackedScene" uid="uid://c546tskdu53j1" path="res://src/UI/Canvas/CanvasPreview.tscn" id="5"]
 [ext_resource type="Texture2D" uid="uid://c7smxwfa8826j" path="res://assets/graphics/timeline/play.png" id="6"]
-[ext_resource type="PackedScene" uid="uid://cii2hpylme60s" path="res://src/UI/Nodes/CollapsibleContainer.tscn" id="7"]
+[ext_resource type="Script" path="res://src/UI/Nodes/CollapsibleContainer.gd" id="7_o7sn3"]
 [ext_resource type="Script" path="res://src/UI/Nodes/ValueSlider.gd" id="8"]
 
 [sub_resource type="ShaderMaterial" id="1"]
@@ -131,9 +131,11 @@ popup/item_0/id = 0
 popup/item_1/text = "Current frame as spritesheet"
 popup/item_1/id = 1
 
-[node name="Options" parent="VBox/Animation/VBoxContainer" instance=ExtResource("7")]
+[node name="Options" type="VBoxContainer" parent="VBox/Animation/VBoxContainer"]
 visible = false
 layout_mode = 2
+theme_type_variation = &"CollapsibleContainer"
+script = ExtResource("7_o7sn3")
 text = "Spritesheet options"
 
 [node name="GridContainer" type="GridContainer" parent="VBox/Animation/VBoxContainer/Options"]
diff --git a/src/UI/Dialogs/ImportPreviewDialog.tscn b/src/UI/Dialogs/ImportPreviewDialog.tscn
index 97a2e0c14..8b0e8ca55 100644
--- a/src/UI/Dialogs/ImportPreviewDialog.tscn
+++ b/src/UI/Dialogs/ImportPreviewDialog.tscn
@@ -3,7 +3,7 @@
 [ext_resource type="Script" path="res://src/UI/Dialogs/ImportPreviewDialog.gd" id="1_r16hn"]
 [ext_resource type="Script" path="res://src/UI/Dialogs/HelperScripts/RowColumnLines.gd" id="2_yokw4"]
 [ext_resource type="Script" path="res://src/UI/Dialogs/HelperScripts/SmartSlicePreview.gd" id="3_aeccv"]
-[ext_resource type="PackedScene" uid="uid://cii2hpylme60s" path="res://src/UI/Nodes/CollapsibleContainer.tscn" id="4_6ispq"]
+[ext_resource type="Script" path="res://src/UI/Nodes/CollapsibleContainer.gd" id="4_7dy5o"]
 [ext_resource type="Script" path="res://src/UI/Nodes/ValueSlider.gd" id="4_nmo33"]
 
 [node name="ImportPreviewDialog" type="ConfirmationDialog"]
@@ -91,8 +91,10 @@ layout_mode = 2
 size_flags_vertical = 0
 mouse_default_cursor_shape = 2
 
-[node name="ImportOptionsContainer" parent="VBoxContainer" instance=ExtResource("4_6ispq")]
+[node name="ImportOptionsContainer" type="VBoxContainer" parent="VBoxContainer"]
 layout_mode = 2
+theme_type_variation = &"CollapsibleContainer"
+script = ExtResource("4_7dy5o")
 text = "Import Options"
 
 [node name="ImportOptions" type="VBoxContainer" parent="VBoxContainer/ImportOptionsContainer"]
diff --git a/src/UI/Nodes/CollapsibleContainer.tscn b/src/UI/Nodes/CollapsibleContainer.tscn
deleted file mode 100644
index b1968e012..000000000
--- a/src/UI/Nodes/CollapsibleContainer.tscn
+++ /dev/null
@@ -1,9 +0,0 @@
-[gd_scene load_steps=2 format=3 uid="uid://cii2hpylme60s"]
-
-[ext_resource type="Script" path="res://src/UI/Nodes/CollapsibleContainer.gd" id="2"]
-
-[node name="CollapsibleContainer" type="VBoxContainer"]
-offset_right = 40.0
-offset_bottom = 20.0
-theme_type_variation = &"CollapsibleContainer"
-script = ExtResource("2")
diff --git a/src/UI/PerspectiveEditor/PerspectiveEditor.tscn b/src/UI/PerspectiveEditor/PerspectiveEditor.tscn
index 53067d322..3612fc24e 100644
--- a/src/UI/PerspectiveEditor/PerspectiveEditor.tscn
+++ b/src/UI/PerspectiveEditor/PerspectiveEditor.tscn
@@ -10,6 +10,8 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 offset_right = -1013.0
 offset_bottom = -510.0
+grow_horizontal = 2
+grow_vertical = 2
 script = ExtResource("1")
 
 [node name="VBoxContainer" type="VBoxContainer" parent="."]
@@ -45,9 +47,6 @@ text = "Tracker Lines"
 [node name="HSeparator" type="HSeparator" parent="VBoxContainer"]
 layout_mode = 2
 
-[node name="HSeparator2" type="HSeparator" parent="VBoxContainer"]
-layout_mode = 2
-
 [node name="Content" type="ScrollContainer" parent="VBoxContainer"]
 layout_mode = 2
 size_flags_vertical = 3
diff --git a/src/UI/PerspectiveEditor/VanishingPoint.tscn b/src/UI/PerspectiveEditor/VanishingPoint.tscn
index 3df1ffbed..2e064f6cb 100644
--- a/src/UI/PerspectiveEditor/VanishingPoint.tscn
+++ b/src/UI/PerspectiveEditor/VanishingPoint.tscn
@@ -1,169 +1,137 @@
-[gd_scene load_steps=6 format=2]
+[gd_scene load_steps=6 format=3 uid="uid://calecly82t1aw"]
 
-[ext_resource path="res://src/UI/Nodes/ValueSlider.tscn" type="PackedScene" id=1]
-[ext_resource path="res://src/UI/PerspectiveEditor/VanishingPoint.gd" type="Script" id=2]
-[ext_resource path="res://src/UI/Nodes/CollapsibleContainer.tscn" type="PackedScene" id=3]
-[ext_resource path="res://assets/graphics/misc/value_arrow.svg" type="Texture2D" id=4]
-[ext_resource path="res://src/UI/PerspectiveEditor/PointCollapseContainer.gd" type="Script" id=5]
+[ext_resource type="PackedScene" uid="uid://yjhp0ssng2mp" path="res://src/UI/Nodes/ValueSlider.tscn" id="1"]
+[ext_resource type="Script" path="res://src/UI/PerspectiveEditor/VanishingPoint.gd" id="2"]
+[ext_resource type="Texture2D" uid="uid://ct8wn8m6x4m54" path="res://assets/graphics/misc/value_arrow.svg" id="4"]
+[ext_resource type="Script" path="res://src/UI/PerspectiveEditor/PointCollapseContainer.gd" id="5"]
+[ext_resource type="Script" path="res://src/UI/Nodes/CollapsibleContainer.gd" id="5_xveuc"]
 
 [node name="VanishingPoint" type="VBoxContainer" groups=["Entry"]]
 offset_right = 261.0
 offset_bottom = 145.0
-script = ExtResource( 2 )
+script = ExtResource("2")
 
 [node name="TitleContainer" type="HBoxContainer" parent="."]
-offset_right = 261.0
-offset_bottom = 20.0
+layout_mode = 2
 
 [node name="PointCollapseContainer" type="Button" parent="TitleContainer"]
 unique_name_in_owner = true
-offset_right = 207.0
-offset_bottom = 20.0
-mouse_default_cursor_shape = 2
+layout_mode = 2
 size_flags_horizontal = 3
-theme_type_variation = "CollapsibleCheckBox"
+mouse_default_cursor_shape = 2
+theme_type_variation = &"CollapsibleCheckBox"
 toggle_mode = true
-script = ExtResource( 5 )
+script = ExtResource("5")
 
 [node name="TextureRect" type="TextureRect" parent="TitleContainer/PointCollapseContainer" groups=["UIButtons"]]
+layout_mode = 0
 anchor_top = 0.5
 anchor_bottom = 0.5
 offset_left = 2.0
 offset_top = -6.0
 offset_right = 14.0
 offset_bottom = 6.0
-rotation = -90.0
-pivot_offset = Vector2( 6, 6 )
-texture = ExtResource( 4 )
+pivot_offset = Vector2(6, 6)
+texture = ExtResource("4")
 
 [node name="Label" type="Label" parent="TitleContainer/PointCollapseContainer"]
+layout_mode = 0
 anchor_right = 1.0
 anchor_bottom = 1.0
 offset_left = 14.0
 theme_type_variation = &"HeaderSmall"
-valign = 1
 
 [node name="ColorPickerButton" type="ColorPickerButton" parent="TitleContainer"]
 unique_name_in_owner = true
-offset_left = 211.0
-offset_right = 261.0
-offset_bottom = 20.0
-custom_minimum_size = Vector2( 50, 0 )
+custom_minimum_size = Vector2(50, 0)
+layout_mode = 2
 
 [node name="Content" type="HBoxContainer" parent="."]
 unique_name_in_owner = true
-offset_top = 24.0
-offset_right = 261.0
-offset_bottom = 130.0
+layout_mode = 2
 
 [node name="Spacer" type="Control" parent="Content"]
-offset_right = 5.0
-offset_bottom = 106.0
-custom_minimum_size = Vector2( 5, 0 )
+custom_minimum_size = Vector2(5, 0)
+layout_mode = 2
 
 [node name="BoundaryL" type="ColorRect" parent="Content"]
-offset_left = 9.0
-offset_right = 11.0
-offset_bottom = 106.0
-custom_minimum_size = Vector2( 2, 0 )
+custom_minimum_size = Vector2(2, 0)
+layout_mode = 2
 
 [node name="VBoxContainer" type="VBoxContainer" parent="Content"]
-offset_left = 15.0
-offset_right = 255.0
-offset_bottom = 106.0
+layout_mode = 2
 size_flags_horizontal = 3
 
 [node name="PointInfo" type="HBoxContainer" parent="Content/VBoxContainer"]
-offset_right = 240.0
-offset_bottom = 52.0
+layout_mode = 2
 
 [node name="Label" type="Label" parent="Content/VBoxContainer/PointInfo"]
-offset_right = 56.0
-offset_bottom = 52.0
+layout_mode = 2
 size_flags_vertical = 5
 text = "Position:"
 
 [node name="Position" type="VBoxContainer" parent="Content/VBoxContainer/PointInfo"]
-offset_left = 60.0
-offset_right = 240.0
-offset_bottom = 52.0
+layout_mode = 2
 size_flags_horizontal = 3
 
-[node name="X" parent="Content/VBoxContainer/PointInfo/Position" instance=ExtResource( 1 )]
+[node name="X" parent="Content/VBoxContainer/PointInfo/Position" instance=ExtResource("1")]
 unique_name_in_owner = true
-offset_right = 180.0
+layout_mode = 2
 step = 0.5
 allow_greater = true
 allow_lesser = true
 prefix = "X :"
 
-[node name="Y" parent="Content/VBoxContainer/PointInfo/Position" instance=ExtResource( 1 )]
+[node name="Y" parent="Content/VBoxContainer/PointInfo/Position" instance=ExtResource("1")]
 unique_name_in_owner = true
-offset_top = 28.0
-offset_right = 180.0
-offset_bottom = 52.0
+layout_mode = 2
 step = 0.5
 allow_greater = true
 allow_lesser = true
 prefix = "Y :"
 
-[node name="CollapsibleContainer" parent="Content/VBoxContainer" instance=ExtResource( 3 )]
-offset_top = 56.0
-offset_right = 240.0
-offset_bottom = 76.0
+[node name="CollapsibleContainer" type="VBoxContainer" parent="Content/VBoxContainer"]
+layout_mode = 2
+theme_type_variation = &"CollapsibleContainer"
+script = ExtResource("5_xveuc")
 text = "Lines"
 
 [node name="HBoxContainer" type="HBoxContainer" parent="Content/VBoxContainer/CollapsibleContainer"]
 visible = false
-offset_top = 24.0
-offset_right = 261.0
-offset_bottom = 44.0
+layout_mode = 2
 
 [node name="Spacer" type="Control" parent="Content/VBoxContainer/CollapsibleContainer/HBoxContainer"]
-offset_right = 20.0
-offset_bottom = 20.0
-custom_minimum_size = Vector2( 20, 0 )
+custom_minimum_size = Vector2(20, 0)
+layout_mode = 2
 
 [node name="VSeparator" type="VSeparator" parent="Content/VBoxContainer/CollapsibleContainer/HBoxContainer"]
-offset_right = 4.0
-offset_bottom = 40.0
+layout_mode = 2
 
 [node name="LinesContainer" type="VBoxContainer" parent="Content/VBoxContainer/CollapsibleContainer/HBoxContainer"]
 unique_name_in_owner = true
-offset_left = 24.0
-offset_right = 261.0
-offset_bottom = 20.0
+layout_mode = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
 
 [node name="AddLine" type="Button" parent="Content/VBoxContainer/CollapsibleContainer/HBoxContainer/LinesContainer"]
-offset_right = 237.0
-offset_bottom = 20.0
+layout_mode = 2
 text = "Add Line"
 
 [node name="Delete" type="Button" parent="Content/VBoxContainer"]
-offset_top = 80.0
-offset_right = 240.0
-offset_bottom = 100.0
-custom_minimum_size = Vector2( 40, 0 )
+custom_minimum_size = Vector2(40, 0)
+layout_mode = 2
 text = "Delete Point"
 
 [node name="BoundaryB" type="ColorRect" parent="Content/VBoxContainer"]
-offset_top = 104.0
-offset_right = 240.0
-offset_bottom = 106.0
-custom_minimum_size = Vector2( 0, 2 )
+custom_minimum_size = Vector2(0, 2)
+layout_mode = 2
 
 [node name="BoundaryR" type="ColorRect" parent="Content"]
-offset_left = 259.0
-offset_right = 261.0
-offset_bottom = 106.0
-custom_minimum_size = Vector2( 2, 0 )
+custom_minimum_size = Vector2(2, 0)
+layout_mode = 2
 
 [node name="HSeparator" type="HSeparator" parent="."]
-offset_top = 134.0
-offset_right = 261.0
-offset_bottom = 144.0
+layout_mode = 2
 theme_override_constants/separation = 10
 
 [connection signal="toggled" from="TitleContainer/PointCollapseContainer" to="TitleContainer/PointCollapseContainer" method="_on_Button_toggled"]