diff --git a/common/css/main.css b/common/css/main.css
index 2d8dbbedad9..12e35ff8136 100644
--- a/common/css/main.css
+++ b/common/css/main.css
@@ -13,6 +13,12 @@
   text-transform:capitalize;
 }
 
+.editor-title small {
+  opacity: 0.5;
+  font-size: 0.7em;
+  font-weight: normal;
+}
+
 .spy {
   position:absolute;
   right:0px;
diff --git a/partials/paneleditor.html b/partials/paneleditor.html
index f5eb79005b8..add08ccc53f 100644
--- a/partials/paneleditor.html
+++ b/partials/paneleditor.html
@@ -1,17 +1,15 @@
 <div class="modal-body" >
-  <div class="pull-right editor-title">{{panel.type}} settings</div>
+  <div class="pull-right editor-title"><small>({{panel.status}})</small> {{panel.type}} settings</div>
 
   <div ng-model="editor.index" bs-tabs>
     <div ng-repeat="tab in ['General','Panel']" data-title="{{tab}}">
     </div>
   </div>
   <div ng-show="editor.index == 0">
-    <h4>{{panel.title}} General <small> panel settings</small></h4>
     <div ng-include src="'partials/panelgeneral.html'"></div>
   </div>
   
   <div ng-show="editor.index == 1">
-    <h4 style="text-transform: capitalize;">{{panel.type}} <small> panel settings. <strong ng-show="!_.isUndefined(panel.status)">({{panel.status}})</strong></small></h4>
     <div ng-include src="edit_path(panel.type)">No additional settings are available for this type of panel.</div>
   </div>
 
diff --git a/partials/panelgeneral.html b/partials/panelgeneral.html
index bed80b31d54..b0aea49802e 100644
--- a/partials/panelgeneral.html
+++ b/partials/panelgeneral.html
@@ -6,6 +6,6 @@
       <label class="small">Span</label> <select class="input-mini" ng-model="panel.span" ng-options="f for f in [0,1,2,3,4,5,6,7,8,9,10,11,12]"></select>
     </div>
     <div class="span1"> 
-      <label class="small"> Editable </label><input type="checkbox" ng-model="panel.editable" ng-checked="panel.editable">
+      <label class="small">Editable</label><input type="checkbox" ng-model="panel.editable" ng-checked="panel.editable">
     </div>
   </div>
\ No newline at end of file
diff --git a/partials/roweditor.html b/partials/roweditor.html
index 130f96ce49e..0378976de00 100644
--- a/partials/roweditor.html
+++ b/partials/roweditor.html
@@ -59,5 +59,5 @@
   </div>
 </div>
 <div class="modal-footer">
-  <button type="button" class="btn btn-success" ng-click="dismiss();reset_panel();close_edit()">Close</button>
+  <button type="button" class="btn btn-success" ng-click="editor.index=0;dismiss();reset_panel();close_edit()">Close</button>
 </div>
\ No newline at end of file