diff --git a/package.json b/package.json
index 305d778c4c0..284e8fc30b6 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "grunt-karma": "~0.8.3",
     "grunt-ngmin": "0.0.3",
     "grunt-string-replace": "~0.2.4",
-    "grunt-usemin": "^2.1.1",
+    "grunt-usemin": "3.0.0",
     "jshint-stylish": "~0.1.5",
     "karma": "~0.12.21",
     "karma-chrome-launcher": "~0.1.4",
diff --git a/src/views/index.html b/src/views/index.html
new file mode 100644
index 00000000000..0cb3e2cd2d7
--- /dev/null
+++ b/src/views/index.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width">
+
+    <title>Grafana</title>
+
+    <link rel="stylesheet" href="/css/grafana.dark.min.css" title="Dark">
+    <link rel="icon" type="image/png" href="/img/fav32.png">
+		<base href="/">
+
+		<script type="text/javascript">
+			window.grafanaBackend = true;
+		</script>
+
+		<!-- build:js app/app.js -->
+    <script src="public/vendor/require/require.js"></script>
+    <script src="public/app/components/require.backend.js"></script>
+    <!-- endbuild -->
+
+    <script>require(['app'], function (app) { app.boot(); })</script>
+
+  </head>
+
+  <body ng-cloak ng-controller="GrafanaCtrl">
+    <link rel="stylesheet" href="/public/css/grafana.light.min.css" ng-if="grafana.style === 'light'">
+
+		<div class="pro-container" ng-class="{'pro-sidemenu-open': grafana.sidemenu}">
+
+			<aside class="pro-sidemenu" ng-if="grafana.sidemenu">
+				<div ng-include="'app/partials/pro/sidemenu.html'"></div>
+			</aside>
+
+			<div class="page-alert-list">
+				<div ng-repeat='alert in dashAlerts.list' class="alert-{{alert.severity}} alert">
+					<button type="button" class="alert-close" ng-click="dashAlerts.clear(alert)">
+						<i class="icon-remove-sign"></i>
+					</button>
+					<div class="alert-title">{{alert.title}}</div>
+					<div ng-bind-html='alert.text'></div>
+				</div>
+			</div>
+
+			<div ng-view class="pro-main-view"></div>
+
+		</div>
+
+  </body>
+
+	<script>
+		window.grafanaBootData = {
+			user:[[.user]],
+			settings: [[.settings]]
+		};
+	</script>
+</html>
diff --git a/tasks/build_task.js b/tasks/build_task.js
index 0c85a52d716..47f4605373e 100644
--- a/tasks/build_task.js
+++ b/tasks/build_task.js
@@ -20,7 +20,7 @@ module.exports = function(grunt) {
     'filerev',
     'usemin',
     'clean:temp',
-    'uglify:dest'
+    //'uglify:dest'
   ]);
 
   grunt.registerTask('build:grafanaVersion', function() {
diff --git a/tasks/options/concat.js b/tasks/options/concat.js
index c0aca70df23..6257547f399 100644
--- a/tasks/options/concat.js
+++ b/tasks/options/concat.js
@@ -1,4 +1,6 @@
 module.exports = function(config) {
+  "use strict";
+
   return {
     cssDark: {
       src: [
@@ -28,7 +30,7 @@ module.exports = function(config) {
     js: {
       src: [
         '<%= destDir %>/vendor/require/require.js',
-        '<%= destDir %>/app/components/require.standalone.js',
+        '<%= destDir %>/app/components/require.<%= mode %>.js',
         '<%= destDir %>/app/app.js',
       ],
       dest: '<%= destDir %>/app/app.js'
diff --git a/tasks/options/usemin.js b/tasks/options/usemin.js
index 0abd8ed4ec5..8c09fd0a6e7 100644
--- a/tasks/options/usemin.js
+++ b/tasks/options/usemin.js
@@ -1,5 +1,11 @@
 module.exports = function(config) {
   return {
-    html: '<%= destDir %>/index.html',
+    html: [
+      '<%= destDir %>/views/index.html',
+      '<%= destDir %>/index.html',
+    ],
+    options: {
+      assetsDirs: ['<%= destDir %>']
+    }
   };
 };
diff --git a/tasks/options/useminPrepare.js b/tasks/options/useminPrepare.js
index 23bab7e3f22..17123ac8790 100644
--- a/tasks/options/useminPrepare.js
+++ b/tasks/options/useminPrepare.js
@@ -1,5 +1,8 @@
 module.exports = function(config) {
   return {
-    html: 'tmp/index.html',
+    html: [
+      'tmp/index.html',
+      'tmp/views/index.html',
+    ]
   };
 };
