diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97f18bf1..607d100d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,31 @@
+# v0.2.0
+## 08/06/2015
+
+1. [](#new)
+    * Added multiple **clear cache** types
+    * Added back to themes link when adding new themes
+    * Properly handles visibility and ordering and guesses best option on new
+    * Added new templates field with support for custom (unsupported) template type
+    * Added new display field for displaying simple text value
+    * **Update Grav** button now works 
+    * Added spanish translation
+    * Added german translation
+1. [](#improved)
+    * Improved page order handling logic
+    * Implemented 2-step theme switching logic with warning
+    * Force `modular` page class for modular template
+    * Clear page cache on page delete (ghost pages still showing)
+    * Clears route on page save so changes such as `slug` are picked up
+    * Fix dashboard layout in Safari
+    * Added tooltips for official 'Team Grav' themes/plugins
+1. [](#bugfix)
+    * Handle modular page templates on create  
+    * Fixed Firefox JS error for arrays
+    * Ensure we don't change page type to empty and save (causing page to be deleted)
+    * Fixed some minor CSS issues with editor
+    * Fixed link to RocketTheme.com
+    * Disabled fields now stay properly disabled
+
 # v0.1.1
 ## 08/04/2015
 
diff --git a/blueprints.yaml b/blueprints.yaml
index 421dc0a6..adaff161 100644
--- a/blueprints.yaml
+++ b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Admin Panel
-version: 0.1.1
+version: 0.2.0
 description: Adds an advanced administration panel to manage your site
 icon: empire
 author:
diff --git a/classes/controller.php b/classes/controller.php
index 9454c84d..647217bc 100644
--- a/classes/controller.php
+++ b/classes/controller.php
@@ -879,7 +879,9 @@ class AdminController
 
         // Always redirect if a page route was changed, to refresh it
         if ($obj instanceof Page\Page) {
-            $obj->unsetRoute();
+            if (method_exists($obj, 'unsetRoute')) {
+                $obj->unsetRoute();
+            }
             $this->setRedirect($this->view . $obj->route());
         }