diff --git a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
index 17350da26a..dfdbbbdbe4 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
@@ -353,6 +353,7 @@ angular.module('umbraco.services')
                     inline: true,
                     show: true,
                     iframe: iframe,
+                    modalClass: "umb-dialog",
                     template: templateUrl
                 });
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/forms.less b/src/Umbraco.Web.UI.Client/src/less/forms.less
index b5396efc13..79aeca4333 100644
--- a/src/Umbraco.Web.UI.Client/src/less/forms.less
+++ b/src/Umbraco.Web.UI.Client/src/less/forms.less
@@ -12,12 +12,14 @@
 }
 
 small.umb-detail,
-label small {
+label small, .guiDialogTiny {
   color: #b3b3b3 !important;
   text-decoration: none;
   display: block;
-  font-weight: normal
+  font-weight: normal;
+  font-size: 11px
 }
+
 label.control-label {
   padding-top: 8px !important;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/main.less b/src/Umbraco.Web.UI.Client/src/less/main.less
index 7b823d407c..1cb6513438 100644
--- a/src/Umbraco.Web.UI.Client/src/less/main.less
+++ b/src/Umbraco.Web.UI.Client/src/less/main.less
@@ -129,6 +129,7 @@ div.umb-codeeditor .umb-btn-toolbar {
 
 .umb-pane > .umb-control-group:last-child {
   border: none;
+  padding-bottom: 0 !important;
 }
 
 .umb-control-group .umb-el-wrap {
diff --git a/src/Umbraco.Web.UI.Client/src/less/modals.less b/src/Umbraco.Web.UI.Client/src/less/modals.less
index 36326b054e..4f5355bcf8 100644
--- a/src/Umbraco.Web.UI.Client/src/less/modals.less
+++ b/src/Umbraco.Web.UI.Client/src/less/modals.less
@@ -56,13 +56,19 @@
 /* umb.dialog is used for the dialogs on the conent tree*/
 .umb-dialog {
 	outline: none;
+	top: 0px;
+	left: 0px;
+	right: 0px;
+	bottom: 0px;
+	position: absolute;
+	padding: 0px;
 }
+
 .umb-dialog .umb-btn-toolbar {
 	text-align: right;
 	padding: 15px 20px 10px 20px;
 	margin-top: 30px;
 	clear: both;
-	border-top: #efefef 1px solid;
 }
 .umb-dialog .umb-btn-toolbar .umb-control-group{
 	border: none;
@@ -70,9 +76,27 @@
 }
 
 .umb-dialog-body{
+	position: absolute;
     overflow:auto;
+    top: 0px;
+    left: 0px;
+    right: 0px;
+    bottom: 90px;
 }
 
+.umb-dialog-footer{
+		border-top: #efefef 1px solid;
+		position: absolute;
+	    overflow:auto;
+	    text-align: right;
+	    
+	    height: 60px;
+	    left: 0px;
+	    right: 0px;
+	    bottom: 0px;
+}
+
+
 /* modal and umb-modal are used for right.hand dialogs */
 .modal.fade.in{border: none !important; border-radius: none !important;}
 .umb-modal.fade {
diff --git a/src/Umbraco.Web.UI.Client/src/less/panel.less b/src/Umbraco.Web.UI.Client/src/less/panel.less
index bb3ead2808..d9d032bfda 100644
--- a/src/Umbraco.Web.UI.Client/src/less/panel.less
+++ b/src/Umbraco.Web.UI.Client/src/less/panel.less
@@ -6,7 +6,6 @@
           top: 0px; bottom: 0px; left: 0px; right: 0px;}
 
 .umb-panel-nobody{padding-top: 100px;}
-
 .umb-panel-header {
   background: @grayLighter;
   border-bottom: 1px solid @grayLight;
@@ -24,11 +23,16 @@
     bottom: 0px;
     position: absolute;
     clear: both;
+    overflow: auto;
 }
 .umb-panel-body.no-header {
     top: 0px;
 }
 
+.umb-panel-body.with-footer {
+    bottom: 90px;
+}
+
 .umb-panel-header h1.umb-headline-editor {
   cursor: text;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/create.html b/src/Umbraco.Web.UI.Client/src/views/content/create.html
index 2a0415a33a..7952752c8d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/create.html
@@ -1,7 +1,7 @@
-<div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.Content.CreateController">
-	<div class="umb-dialog-body" auto-scale="90">
+<div class="umb-dialog-body" ng-controller="Umbraco.Editors.Content.CreateController">
+	
+	<div class="umb-pane">
 	<h5>Create a page under {{currentNode.name}}</h5>
-
 	<ul class="umb-actions umb-actions-child">
 
 		<li ng-repeat="docType in allowedTypes">
@@ -30,10 +30,9 @@
 		    </a>
 		</li>	-->
 	</ul>
-			
-	</div>
-	
-	<div class="btn-toolbar umb-btn-toolbar">
-		<button class="btn" ng-click="nav.hideDialog()">Do something else</button>
-	</div>
+	</div>		
 </div>
+	
+<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
+		<button class="btn" ng-click="nav.hideDialog()">Do something else</button>
+</div>
\ No newline at end of file