diff --git a/src/blenderbim/blenderbim/bim/module/model/__init__.py b/src/blenderbim/blenderbim/bim/module/model/__init__.py
index b35bb75bd6..0ea3b71e36 100644
--- a/src/blenderbim/blenderbim/bim/module/model/__init__.py
+++ b/src/blenderbim/blenderbim/bim/module/model/__init__.py
@@ -115,7 +115,6 @@ classes = (
     ui.BIM_PT_roof,
     ui.LaunchTypeManager,
     ui.BIM_MT_model,
-    ui.BIM_PT_GridsSpatialManager,
     ui.BIM_PT_Grids,
     grid.BIM_OT_add_object,
     stair.BIM_OT_add_object,
diff --git a/src/blenderbim/blenderbim/bim/module/model/ui.py b/src/blenderbim/blenderbim/bim/module/model/ui.py
index e2bc736fb9..63f6452982 100644
--- a/src/blenderbim/blenderbim/bim/module/model/ui.py
+++ b/src/blenderbim/blenderbim/bim/module/model/ui.py
@@ -139,30 +139,20 @@ class BIM_PT_authoring(Panel):
         row.operator("bim.toggle_space_visibility")
 
 
-class BIM_PT_GridsSpatialManager(Panel):
-    bl_label = "Grids and Containers"
-    bl_idname = "BIM_PT_GridsSpatialManager"
+class BIM_PT_Grids(Panel):
+    bl_label = "Grids"
+    bl_idname = "BIM_PT_Grids"
     bl_space_type = "VIEW_3D"
     bl_region_type = "UI"
     bl_options = {"DEFAULT_CLOSED"}
     bl_category = "BlenderBIM"
 
-    def draw(self, context):
-        pass
-
-class BIM_PT_Grids(Panel):
-    bl_label = "Grid Creator"
-    bl_idname = "BIM_PT_Grids"
-    bl_space_type = "VIEW_3D"
-    bl_region_type = "UI"
-    bl_options = {"DEFAULT_CLOSED"}
-    bl_parent_id = "BIM_PT_GridsSpatialManager"
-
     def draw(self, context):
         self.animation_props = context.scene.BIMAnimationProperties
         row = self.layout.row()
         row.operator("mesh.add_grid", icon="ADD", text="Add Grids")
 
+
 class BIM_PT_array(bpy.types.Panel):
     bl_label = "IFC Array"
     bl_idname = "BIM_PT_array"
diff --git a/src/blenderbim/blenderbim/bim/module/spatial/__init__.py b/src/blenderbim/blenderbim/bim/module/spatial/__init__.py
index b29fff2371..56f03cdc27 100644
--- a/src/blenderbim/blenderbim/bim/module/spatial/__init__.py
+++ b/src/blenderbim/blenderbim/bim/module/spatial/__init__.py
@@ -45,7 +45,7 @@ classes = (
     ui.BIM_PT_spatial,
     ui.BIM_UL_containers,
     ui.BIM_UL_containers_manager,
-    ui.BIM_PT_Storeys,
+    ui.BIM_PT_SpatialManager,
     workspace.Hotkey,
 )
 
diff --git a/src/blenderbim/blenderbim/bim/module/spatial/ui.py b/src/blenderbim/blenderbim/bim/module/spatial/ui.py
index 46451f8f56..f1727acd58 100644
--- a/src/blenderbim/blenderbim/bim/module/spatial/ui.py
+++ b/src/blenderbim/blenderbim/bim/module/spatial/ui.py
@@ -96,13 +96,14 @@ class BIM_UL_containers(UIList):
             )
 
 
-class BIM_PT_Storeys(Panel):
-    bl_label = "Spatial Manager"
-    bl_idname = "BIM_PT_Storeys"
-    bl_space_type = "VIEW_3D"
-    bl_region_type = "UI"
+class BIM_PT_SpatialManager(Panel):
+    bl_label = "IFC Spatial Manager"
+    bl_idname = "BIM_PT_SpatialManager"
+    bl_space_type = "PROPERTIES"
+    bl_region_type = "WINDOW"
+    bl_context = "scene"
     bl_options = {"DEFAULT_CLOSED"}
-    bl_parent_id = "BIM_PT_GridsSpatialManager"
+    bl_parent_id = "BIM_PT_project_setup"
 
     @classmethod
     def poll(cls, context):