diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/macropicker/macropicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/macropicker/macropicker.html
index 418e6b5ca6..6bcbaad50c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/macropicker/macropicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/macropicker/macropicker.html
@@ -27,12 +27,12 @@
                 </li>
             </ul>
 
-            <umb-empty-state ng-if="nomacros"
-                             position="center">
-                <localize key="defaultdialogs_nomacros">
+            <umb-empty-state
+                ng-if="nomacros"
+                position="center">
+                <localize key="defaultdialogs_noMacros">
                     There are no macros available to insert
                 </localize>
-
             </umb-empty-state>
         </div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
index 97aa50cbbf..4cf55f4768 100644
--- a/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
@@ -444,23 +444,15 @@
         }
 
         function getMasterTemplateName(masterTemplateAlias, templates) {
-
             if(masterTemplateAlias) {
-
                 var templateName = "";
-
                 angular.forEach(templates, function(template){
                     if(template.alias === masterTemplateAlias) {
                         templateName = template.name;
                     }
                 });
-
                 return templateName;
-
-            } else {
-                return "no master";
             }
-            
         }
 
         function removeMasterTemplate() {
diff --git a/src/Umbraco.Web.UI.Client/src/views/templates/edit.html b/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
index 2e5593894c..bdfb9517f3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
@@ -33,7 +33,11 @@
                                 class="umb-era-button umb-button--s"
                                 ng-click="vm.openMasterTemplateOverlay()">
                                 <i class="icon icon-layout"></i>
-                                <span class="bold">Master template:</span> <span style="margin-left: 5px;">{{ vm.getMasterTemplateName(vm.template.masterTemplateAlias, vm.templates) }}</span>
+                                <span class="bold"><localize key="template_mastertemplate">Master template</localize>:</span>
+                                <span style="margin-left: 5px;">
+                                    <span ng-if="vm.template.masterTemplateAlias">{{ vm.getMasterTemplateName(vm.template.masterTemplateAlias, vm.templates) }}</span>
+                                    <span ng-if="!vm.template.masterTemplateAlias"><localize key="template_noMaster">No master</localize></span>
+                                </span>
                             </button>
 
                             <a ng-if="vm.template.masterTemplateAlias" ng-click="vm.removeMasterTemplate()" class="umb-era-button umb-button--s dropdown-toggle umb-button-group__toggle">
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
index e14a0f9109..32b1ef780e 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
@@ -291,6 +291,7 @@
     <key alias="selectMember">Vælg medlem</key>
     <key alias="selectMemberGroup">Vælg medlemsgruppe</key>
     <key alias="noMacroParams">Der er ingen parametre for denne makro</key>
+    <key alias="noMacros">Der er ikke tilføjet nogle makroer</key>
     <key alias="linkYour">Link dit</key>
     <key alias="unLinkYour">Fjern link fra dit</key>
     <key alias="account">konto</key>
@@ -1039,6 +1040,7 @@ Mange hilsner fra Umbraco robotten
 
     <key alias="mastertemplate">Master skabelon</key>
     <key alias="noMastertemplate">Ingen master skabelon</key>
+    <key alias="noMaster">Ingen master</key>
 
     <key alias="renderBody">Indsæt en underliggende skabelon</key>
     <key alias="renderBodyDesc">
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 3a7a0fda7c..7243a34490 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -305,6 +305,7 @@
     <key alias="selectMemberGroup">Select member group</key>
     <key alias="noIconsFound">No icons were found</key>
     <key alias="noMacroParams">There are no parameters for this macro</key>
+    <key alias="noMacros">There are no macros available to insert</key>
     <key alias="externalLoginProviders">External login providers</key>
     <key alias="exceptionDetail">Exception Details</key>
     <key alias="stacktrace">Stacktrace</key>
@@ -1057,6 +1058,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     
     <key alias="mastertemplate">Master template</key>
     <key alias="noMastertemplate">No master template</key>
+    <key alias="noMaster">No master</key>
 
     <key alias="renderBody">Render child template</key>
     <key alias="renderBodyDesc">