diff --git a/Editor/ScenePartitionSOEditor.cs b/Editor/ScenePartitionSOEditor.cs
index e188553..5f0e42e 100644
--- a/Editor/ScenePartitionSOEditor.cs
+++ b/Editor/ScenePartitionSOEditor.cs
@@ -39,33 +39,28 @@ public override void OnInspectorGUI()
 
                 EditorGUIUtils.HorizontalLine();
 
-                using (new EditorGUILayout.HorizontalScope())
+                if (GUILayout.Button("Load All"))
                 {
-                    if (GUILayout.Button("Load All", EditorStyles.miniButtonLeft))
-                    {
-                        scenePartitionSO.LoadAll();
-                    }
-
-                    if (GUILayout.Button("Unload", EditorStyles.miniButtonRight))
-                    {
-                        scenePartitionSO.Unload();
-                    }
+                    scenePartitionSO.LoadAll();
                 }
 
                 using (new EditorGUILayout.HorizontalScope())
                 {
-                    if (GUILayout.Button("Save", EditorStyles.miniButtonLeft))
+                    if (GUILayout.Button(new GUIContent("Unload", "Empty the scene and save it (so it has no changes in source control)."), EditorStyles.miniButtonLeft))
                     {
-                        scenePartitionSO.Save();
+                        scenePartitionSO.Unload();
                     }
 
-                    if (GUILayout.Button(new GUIContent("Reload", "Discard changes and reload"), EditorStyles.miniButtonRight))
+                    if (GUILayout.Button(new GUIContent("Reload", "Discard changes and reload loaded partitions."), EditorStyles.miniButtonRight))
                     {
                         scenePartitionSO.Reload();
                     }
                 }
 
-                EditorGUIUtils.HorizontalLine();
+                if (GUILayout.Button("Save"))
+                {
+                    scenePartitionSO.Save();
+                }
 
                 using (new EditorGUILayout.HorizontalScope())
                 {
@@ -88,13 +83,18 @@ public override void OnInspectorGUI()
 
                 if (scenePartitionSO.Data.SceneGrid != null)
                 {
-                    gridId = EditorGUILayout.IntField("gridId", gridId);
-
-                    if (GUILayout.Button("LoadSceneGrid"))
+                    using (new EditorGUILayout.HorizontalScope())
                     {
-                        scenePartitionSO.LoadCell(gridId);
+                        gridId = EditorGUILayout.IntField("gridId", gridId);
+
+                        if (GUILayout.Button("LoadSceneGrid"))
+                        {
+                            scenePartitionSO.LoadCell(gridId);
+                        }
                     }
 
+                    EditorGUIUtils.HorizontalLine();
+
                     using (EditorGUIUtils.FoldoutHeaderScope foldoutGroup = new EditorGUIUtils.FoldoutHeaderScope("gridData", ref foldoutGroupEnabled))
                     {
                         if (!foldoutGroupEnabled) return;