diff --git a/src/app/partials/unsaved-changes.html b/src/app/partials/unsaved-changes.html
index 38d86cd2ede..5ea9082d13f 100644
--- a/src/app/partials/unsaved-changes.html
+++ b/src/app/partials/unsaved-changes.html
@@ -1,12 +1,16 @@
 <div class="modal-header">
-  <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-  <h3>{{modal.title}}</h3>
 </div>
 <div class="modal-body">
 
-  <div ng-bind-html='modal.body'></div>
+  <h3 class="text-center"><i class="icon-warning-sign"></i> Unsaved changes</h3>
+  <div class="row-fluid">
+	<span class="span3"></span>
+	<button type="button" class="btn btn-info span2" ng-click="dismiss()">Cancel</button>
+	<button type="button" class="btn btn-success span2" ng-click="save()">Save Changes</button>
+	<button type="button" class="btn btn-warning span2" ng-click="ignore();dismiss();">Ignore changes</button>
+	<span class="span3"></span>
+  </div>
 
 </div>
 <div class="modal-footer">
-  <button type="button" class="btn btn-danger" ng-click="dismiss()">Close</button>
 </div>
\ No newline at end of file
diff --git a/src/app/services/unsavedChangesSrv.js b/src/app/services/unsavedChangesSrv.js
index b10c63d7b2a..3789b9fa2eb 100644
--- a/src/app/services/unsavedChangesSrv.js
+++ b/src/app/services/unsavedChangesSrv.js
@@ -52,7 +52,13 @@ function (angular, _) {
 
     modalScope.ignore = function() {
       dashboard.original = null;
-      $location.path(self.next)
+      var baseLen = $location.absUrl().length - $location.url().length;
+      var nextUrl = self.next.substring(baseLen);
+      $location.url(nextUrl);
+    };
+
+    modalScope.save = function() {
+
     };
 
   });