diff --git a/public/directives/wz-list-manage/wz-list-manage.html b/public/directives/wz-list-manage/wz-list-manage.html
index 3c5c54db4..b665c5004 100644
--- a/public/directives/wz-list-manage/wz-list-manage.html
+++ b/public/directives/wz-list-manage/wz-list-manage.html
@@ -1,5 +1,5 @@
 <div layout="column" layout-align="start">
-    <div layout="row" class="wz-margin-top-8 md-padding-h">
+    <div layout="row" ng-class="hideClose ? ['wz-margin-top-8', 'md-padding-h'] : ''">
         <span ng-if="!hideClose" ng-click='closeFn()' class='btn btn-info wz-margin-right-8'>Cancel</span>
         <button ng-disabled='items.length === 0 || (currentList.new && !currentList.newName)' ng-click='saveList()'
             class='btn wz-button pull-right'>
@@ -9,8 +9,9 @@
             type="text" class="kuiLocalSearchInput ng-empty ng-pristine ng-scope ng-touched ng-valid wz-margin-left-8"
             aria-invalid="false">
     </div>
-    <div layout="row" class="wz-padding-left-8 wz-padding-right-8" layout-align="start stretch">
-        <md-card flex class="wz-md-card">
+    <div layout="row" ng-class="hideClose ? ['wz-padding-left-8', 'wz-padding-right-8'] : ['wz-padding-top-14']"
+        layout-align="start stretch">
+        <md-card flex class="wz-md-card" ng-class="{ 'wz-no-margin' : !hideClose }">
             <md-card-content>
                 <div layout="row">
                     <input placeholder="Filter entries..." ng-model="searchTerm" ng-change="filterTable()" type="text"
diff --git a/public/templates/management/ruleset/cdblists/cdblists-detail.html b/public/templates/management/ruleset/cdblists/cdblists-detail.html
index 96c683c3f..7f3401341 100644
--- a/public/templates/management/ruleset/cdblists/cdblists-detail.html
+++ b/public/templates/management/ruleset/cdblists/cdblists-detail.html
@@ -1,4 +1,4 @@
-<div ng-if="cdbctrl.viewingDetail" layout="column" class="">
+<div ng-if="cdbctrl.viewingDetail" layout="column" ng-class="{ 'md-padding' : cdbctrl.addingList }">
     <!-- Back button and title -->
     <div layout="row" layout-align="start center">
         <!-- Back button -->
diff --git a/public/templates/management/ruleset/decoders/decoders-list.html b/public/templates/management/ruleset/decoders/decoders-list.html
index 3b7604000..1653ae422 100644
--- a/public/templates/management/ruleset/decoders/decoders-list.html
+++ b/public/templates/management/ruleset/decoders/decoders-list.html
@@ -58,7 +58,7 @@
             </div>
             <div layout="row" ng-if="dctrl.newFile" class="wz-padding-bottom-14">
                 <span ng-click='dctrl.closeEditingFile()' class='btn btn-info'>Cancel</span>
-                <button ng-disabled='dctrl.xmlHasErrors' ng-click='dctrl.doSaveConfig(true,dctrl.newFileName)' class='btn wz-button pull-right wz-margin-left-8'>
+                <button ng-disabled='dctrl.xmlHasErrors || dctrl.newFileName ===  ""' ng-click='dctrl.doSaveConfig(true,dctrl.newFileName)' class='btn wz-button pull-right wz-margin-left-8'>
                     <span ng-show='!dctrl.xmlHasErrors'><i aria-hidden='true' class='fa fa-fw fa-save'></i>Save
                         file</span>
                     <span ng-show='dctrl.xmlHasErrors' class='btn-danger'><i aria-hidden='true' class='fa fa-fw fa-exclamation-triangle'></i>
diff --git a/public/templates/management/ruleset/rules/rules-list.html b/public/templates/management/ruleset/rules/rules-list.html
index 48fc76505..e5fc6355c 100644
--- a/public/templates/management/ruleset/rules/rules-list.html
+++ b/public/templates/management/ruleset/rules/rules-list.html
@@ -75,7 +75,7 @@
             </div>
             <div layout="row" ng-if="newFile" class="wz-padding-bottom-14">
                 <span ng-click='closeEditingFile()' class='btn btn-info'>Cancel</span>
-                <button ng-disabled='xmlHasErrors' ng-click='doSaveConfig(true,newFileName)' class='btn wz-button pull-right wz-margin-left-8'>
+                <button ng-disabled='xmlHasErrors || newFileName === ""' ng-click='doSaveConfig(true,newFileName)' class='btn wz-button pull-right wz-margin-left-8'>
                     <span ng-show='!xmlHasErrors'><i aria-hidden='true' class='fa fa-fw fa-save'></i>Save
                         file</span>
                     <span ng-show='xmlHasErrors' class='btn-danger'><i aria-hidden='true' class='fa fa-fw fa-exclamation-triangle'></i>