diff --git a/include/AME/Forms/MainWindow.h b/include/AME/Forms/MainWindow.h
index d5c272c..9ecc1fc 100644
--- a/include/AME/Forms/MainWindow.h
+++ b/include/AME/Forms/MainWindow.h
@@ -192,6 +192,7 @@ namespace ame
         void setScriptEditorButtonsEnabled(bool enabled);
 
         void on_action_Open_ROM_triggered();
+        void on_action_Reload_ROM_triggered();
         void on_sldWildGrassChance_valueChanged(int value);
         void on_sldWildWaterChance_valueChanged(int value);
         void on_sldWildFishingChance_valueChanged(int value);
diff --git a/include/AME/Widgets/Rendering/AMEMapView.h b/include/AME/Widgets/Rendering/AMEMapView.h
index e3b8d06..af42995 100644
--- a/include/AME/Widgets/Rendering/AMEMapView.h
+++ b/include/AME/Widgets/Rendering/AMEMapView.h
@@ -120,7 +120,7 @@ namespace ame
         bool movementMode() const;
 
         ///////////////////////////////////////////////////////////
-        /// \brief Retrieves the primary blockset size.
+        /// \brief Retrieves the main map position.
         ///
         ///////////////////////////////////////////////////////////
         QPoint mainPos();
diff --git a/resources/UI/SettingsDialog.ui b/resources/UI/SettingsDialog.ui
index 17aa1bc..992bb9a 100644
--- a/resources/UI/SettingsDialog.ui
+++ b/resources/UI/SettingsDialog.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>Settings</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2" rowstretch="0,0" columnstretch="1,0" columnminimumwidth="300,0">
    <property name="sizeConstraint">
diff --git a/resources/UI/TilesetDialog.ui b/resources/UI/TilesetDialog.ui
index bcd92eb..b8cca0d 100644
--- a/resources/UI/TilesetDialog.ui
+++ b/resources/UI/TilesetDialog.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>Tileset Editor</string>
   </property>
   <property name="modal">
    <bool>false</bool>
diff --git a/src/Forms/MainWindow.cpp b/src/Forms/MainWindow.cpp
index b0039ce..10342fa 100644
--- a/src/Forms/MainWindow.cpp
+++ b/src/Forms/MainWindow.cpp
@@ -936,6 +936,19 @@ namespace ame
             loadMapData();
     }
 
+    ///////////////////////////////////////////////////////////
+    // Function type:  Slot
+    // Contributors:   Nekaida
+    // Last edit by:   Nekaida
+    // Date of edit:   6/14/2017
+    //
+    ///////////////////////////////////////////////////////////
+    void MainWindow::on_action_Reload_ROM_triggered()
+    {
+        if(loadROM(m_Rom.info().path()))
+            loadMapData();
+    }
+
     ///////////////////////////////////////////////////////////
     // Function type:  Slot
     // Contributors:   Pokedude
@@ -1020,7 +1033,7 @@ namespace ame
                 MapHeader header;
                 header.read(m_Rom, offset);
                 if (header.primary()->image()->raw().isEmpty() ||
-                    header.primary()->image()->raw().isEmpty())
+                    header.secondary()->image()->raw().isEmpty())
                 {
                     // Tilesets invalid, abort
                     Messages::showMessage(this, "Layout says: \"I don't want to load tilesets!\"");
@@ -2048,11 +2061,13 @@ namespace ame
     // Function type:  Helper
     // Contributors:   Diegoisawesome, Nekaida
     // Last edit by:   Nekaida
-    // Date of edit:   3/26/2017
+    // Date of edit:   5/16/2017
     //
     ///////////////////////////////////////////////////////////
     void MainWindow::toggle_grid(bool checked)
     {
+        ui->btnMapGrid->setChecked(checked);
+        ui->btnEntitiesGrid->setChecked(checked);
         ui->glMapEditor->setGridVisible(checked);
         ui->glBlockEditor->setGridVisible(checked);
         ui->glEntityEditor->setGridVisible(checked);