diff --git a/public/app/core/directives/misc.js b/public/app/core/directives/misc.js
index 97361ed02d3..b3d6de2585d 100644
--- a/public/app/core/directives/misc.js
+++ b/public/app/core/directives/misc.js
@@ -62,12 +62,13 @@ function (angular, coreModule, kbn) {
         var label = '<label for="' + scope.$id + model + '" class="checkbox-label">' +
           text + tip + '</label>';
 
-        var template = '<input class="cr1" id="' + scope.$id + model + '" type="checkbox" ' +
+        var template =
+          '<input class="cr1" id="' + scope.$id + model + '" type="checkbox" ' +
           '       ng-model="' + model + '"' + ngchange +
           '       ng-checked="' + model + '"></input>' +
           ' <label for="' + scope.$id + model + '" class="cr1"></label>';
 
-        template = label + template;
+        template = template + label;
         elem.replaceWith($compile(angular.element(template))(scope));
       }
     };
diff --git a/public/app/features/apps/partials/edit.html b/public/app/features/apps/partials/edit.html
index b770914c802..3dd8e24d593 100644
--- a/public/app/features/apps/partials/edit.html
+++ b/public/app/features/apps/partials/edit.html
@@ -7,34 +7,30 @@
 
 <div class="page-container" style="background: transparent; border: 0;">
 	<div class="apps-side-box">
-		<img class="apps-ide-box-logo" src="{{ctrl.appModel.info.logos.large}}">
-		</img>
+		<div class="apps-side-box-logo" >
+			<img src="{{ctrl.appModel.info.logos.large}}">
+		</div>
 		<ul class="app-side-box-links">
+			<li>
+				By <a href="{{ctrl.appModel.info.author.url}}" class="external-link" target="_blank">{{ctrl.appModel.info.author.name}}</a>
+			</li>
 			<li ng-repeat="link in ctrl.appModel.info.links">
-				<a href="{{link.url}}">{{link.name}}</a>
+				<a href="{{link.url}}" class="external-link" target="_blank">{{link.name}}</a>
 			</li>
 		</ul>
 	</div>
-  <div class="page-wide" ng-init="ctrl.init()">
+
+  <div class="page-wide-margined" ng-init="ctrl.init()">
 		<h2>{{ctrl.appModel.name}}</h2>
 		<em>
 			{{ctrl.appModel.info.description}}
 		</em>
 
-		<form name="editForm">
-			<div class="tight-form">
-				<ul class="tight-form-list">
-					<li class="tight-form-item">
-						<editor-checkbox text="Enabled" model="ctrl.appModel.enabled" change="enabledChanged()"></editor-checkbox>
-					</li>
-					<li class="tight-form-item">
-						<editor-checkbox text="Pinned" model="ctrl.appModel.pinned" change="enabledChanged()"></editor-checkbox>
-					</li>
-				</ul>
-				<div class="clearfix"></div>
-			</div>
+		<div class="form-inline">
+			<editor-checkbox text="Enabled" model="ctrl.appModel.enabled" change="enabledChanged()"></editor-checkbox>
+			<editor-checkbox text="Pinned" model="ctrl.appModel.pinned" change="enabledChanged()"></editor-checkbox>
+		</div>
 
 			<app-config-loader></app-config-loader>
-		</form>
 	</div>
 </div>
diff --git a/public/app/features/panel/panel_directive.js b/public/app/features/panel/panel_directive.js
index c75c67ce825..ef36d3a1a2a 100644
--- a/public/app/features/panel/panel_directive.js
+++ b/public/app/features/panel/panel_directive.js
@@ -90,7 +90,7 @@ function (angular, $, config) {
               scope.target.refId = 'A';
             }
 
-            var panelEl = angular.element(document.createElement('metric-query-editor-' + ds.meta.type));
+            var panelEl = angular.element(document.createElement('metric-query-editor-' + ds.meta.id));
             elem.append(panelEl);
             $compile(panelEl)(editorScope);
           });
diff --git a/public/less/apps.less b/public/less/apps.less
new file mode 100644
index 00000000000..b53b0272290
--- /dev/null
+++ b/public/less/apps.less
@@ -0,0 +1,26 @@
+.apps-side-box {
+  float: left;
+}
+
+.apps-side-box-logo {
+  padding: 15px;
+  background: @grafanaPanelBackground;
+  width: 120px;
+  text-align: center;
+  img {
+    max-width: 100px;
+  }
+  margin-bottom: 10px;
+}
+
+.app-side-box-links {
+  list-style: none;
+  margin: 0;
+
+  li {
+    background: @grafanaPanelBackground;
+    margin-top: 4px;
+    padding-left: 10px;
+    line-height: 25px;
+  }
+}
diff --git a/public/less/gfbox.less b/public/less/gfbox.less
index 46967d143c5..55330d26513 100644
--- a/public/less/gfbox.less
+++ b/public/less/gfbox.less
@@ -84,6 +84,11 @@
   max-width: 1000px;
 }
 
+.page-wide-margined {
+  margin-left: 170px;
+  max-width: 1000px;
+}
+
 .admin-page {
   max-width: 800px;
   margin-left: 10px;
diff --git a/public/less/grafana.less b/public/less/grafana.less
index dcd6b4b734d..6e31e628c82 100644
--- a/public/less/grafana.less
+++ b/public/less/grafana.less
@@ -21,6 +21,7 @@
 @import "tabs.less";
 @import "timepicker.less";
 @import "alerting.less";
+@import "apps.less";
 @import "filter-controls.less";
 @import "filter-list.less";
 @import "filter-table.less";
diff --git a/public/less/type.less b/public/less/type.less
index 0aeec228d6a..1e958c4b097 100644
--- a/public/less/type.less
+++ b/public/less/type.less
@@ -245,3 +245,8 @@ address {
   font-style: normal;
   line-height: @baseLineHeight;
 }
+
+a.external-link {
+  color: @blue;
+  text-decoration: underline;
+}