diff --git a/game/autoload/CursorManager.gd b/game/cursors/autoload/CursorManager.gd
similarity index 100%
rename from game/autoload/CursorManager.gd
rename to game/cursors/autoload/CursorManager.gd
diff --git a/game/autoload/CursorManager.tscn b/game/cursors/autoload/CursorManager.tscn
similarity index 91%
rename from game/autoload/CursorManager.tscn
rename to game/cursors/autoload/CursorManager.tscn
index 7f244a9f..5bf77602 100644
--- a/game/autoload/CursorManager.tscn
+++ b/game/cursors/autoload/CursorManager.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=9 format=2]
 
-[ext_resource path="res://autoload/CursorManager.gd" type="Script" id=1]
+[ext_resource path="res://cursors/autoload/CursorManager.gd" type="Script" id=1]
 [ext_resource path="res://cursors/arrow16.png" type="Texture" id=2]
 [ext_resource path="res://cursors/loot16.png" type="Texture" id=3]
 [ext_resource path="res://cursors/attack16.png" type="Texture" id=4]
@@ -11,6 +11,7 @@
 
 
 
+
 [node name="CursorManager" type="Node"]
 script = ExtResource( 1 )
 default_cursor = ExtResource( 2 )
diff --git a/game/project.godot b/game/project.godot
index 7cb28172..d7815abd 100644
--- a/game/project.godot
+++ b/game/project.godot
@@ -342,10 +342,10 @@ config/version="0.2"
 [autoload]
 
 Logger="*res://autoload/Logger.tscn"
-Settings="*res://autoload/SettingsManager.gd"
-CursorManager="*res://autoload/CursorManager.tscn"
-WorldNumbers="*res://autoload/WorldNumbers.tscn"
-ThemeAtlas="*res://autoload/ThemeAtlas.tscn"
+Settings="*res://ui/autoload/SettingsManager.gd"
+CursorManager="*res://cursors/autoload/CursorManager.tscn"
+WorldNumbers="*res://ui/autoload/WorldNumbers.tscn"
+ThemeAtlas="*res://ui/autoload/ThemeAtlas.tscn"
 Server="*res://autoload/Server.tscn"
 
 [debug]
diff --git a/game/scenesWorld.tscn.tres b/game/scenesWorld.tscn.tres
new file mode 100644
index 00000000..012a2252
--- /dev/null
+++ b/game/scenesWorld.tscn.tres
@@ -0,0 +1,3 @@
+[gd_resource type="PropData" format=2]
+
+[resource]
diff --git a/game/autoload/SettingsManager.gd b/game/ui/autoload/SettingsManager.gd
similarity index 100%
rename from game/autoload/SettingsManager.gd
rename to game/ui/autoload/SettingsManager.gd
diff --git a/game/autoload/SettingsManager.tscn b/game/ui/autoload/SettingsManager.tscn
similarity index 56%
rename from game/autoload/SettingsManager.tscn
rename to game/ui/autoload/SettingsManager.tscn
index 8e95a7d7..e07f733e 100644
--- a/game/autoload/SettingsManager.tscn
+++ b/game/ui/autoload/SettingsManager.tscn
@@ -1,6 +1,7 @@
 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://autoload/SettingsManager.gd" type="Script" id=1]
+[ext_resource path="res://ui/autoload/SettingsManager.gd" type="Script" id=1]
+
 
 [node name="SettingsManager" type="Node"]
 script = ExtResource( 1 )
diff --git a/game/autoload/ThemeAtlas.gd b/game/ui/autoload/ThemeAtlas.gd
similarity index 100%
rename from game/autoload/ThemeAtlas.gd
rename to game/ui/autoload/ThemeAtlas.gd
diff --git a/game/autoload/ThemeAtlas.tscn b/game/ui/autoload/ThemeAtlas.tscn
similarity index 100%
rename from game/autoload/ThemeAtlas.tscn
rename to game/ui/autoload/ThemeAtlas.tscn
diff --git a/game/autoload/WorldNumbers.gd b/game/ui/autoload/WorldNumbers.gd
similarity index 100%
rename from game/autoload/WorldNumbers.gd
rename to game/ui/autoload/WorldNumbers.gd
diff --git a/game/autoload/WorldNumbers.tscn b/game/ui/autoload/WorldNumbers.tscn
similarity index 73%
rename from game/autoload/WorldNumbers.tscn
rename to game/ui/autoload/WorldNumbers.tscn
index 7037d13a..40ef41f5 100644
--- a/game/autoload/WorldNumbers.tscn
+++ b/game/ui/autoload/WorldNumbers.tscn
@@ -1,8 +1,9 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://autoload/WorldNumbers.gd" type="Script" id=1]
+[ext_resource path="res://ui/autoload/WorldNumbers.gd" type="Script" id=1]
 [ext_resource path="res://ui/numbers/Number.tscn" type="PackedScene" id=2]
 
+
 [node name="WorldNumbers" type="Node"]
 script = ExtResource( 1 )
 number_scene = ExtResource( 2 )
diff --git a/game/ui/windows/SpellContainer.tscn b/game/ui/windows/SpellContainer.tscn
index 1a8516d6..8d7ecdc0 100644
--- a/game/ui/windows/SpellContainer.tscn
+++ b/game/ui/windows/SpellContainer.tscn
@@ -108,7 +108,7 @@ size_flags_horizontal = 3
 [node name="Button" type="Button" parent="SpellEntryPopup/VBoxContainer/HBoxContainer"]
 margin_left = 258.0
 margin_right = 288.0
-margin_bottom = 26.269
+margin_bottom = 26.5702
 rect_min_size = Vector2( 30, 0 )
 text = "X"
 
@@ -121,13 +121,14 @@ margin_bottom = 38.0
 visible = false
 margin_top = 46.0
 margin_right = 288.0
-margin_bottom = 66.0
+margin_bottom = 69.0
 rect_min_size = Vector2( 0, 20 )
 
 [node name="KnownLabel" type="Label" parent="SpellEntryPopup/VBoxContainer/PanelContainer"]
-margin_top = 2.0
-margin_right = 288.0
-margin_bottom = 17.0
+margin_left = 4.0
+margin_top = 4.0
+margin_right = 284.0
+margin_bottom = 19.0
 text = "Known"
 align = 1
 valign = 1
@@ -136,7 +137,7 @@ valign = 1
 visible = false
 margin_top = 46.0
 margin_right = 288.0
-margin_bottom = 72.269
+margin_bottom = 72.5702
 text = "Learn"
 
 [node name="RichTextLabel" type="RichTextLabel" parent="SpellEntryPopup/VBoxContainer"]