diff --git a/src/Umbraco.Tests/Install/InstallHelperTests.cs b/src/Umbraco.Tests/Install/InstallHelperTests.cs
index 4c68a3df4a..1338df0239 100644
--- a/src/Umbraco.Tests/Install/InstallHelperTests.cs
+++ b/src/Umbraco.Tests/Install/InstallHelperTests.cs
@@ -34,9 +34,9 @@ namespace Umbraco.Tests.Install
                 appCtx,
                 true);
 
-            var helper = new InstallHelper(umbCtx, InstallStatusType.NewInstall);
+            var helper = new InstallHelper(umbCtx);
 
-            var steps = helper.GetSteps().ToArray();
+            var steps = helper.GetAllSteps().ToArray();
 
             var expected = new[]
             {
@@ -65,9 +65,9 @@ namespace Umbraco.Tests.Install
                 appCtx,
                 true);
 
-            var helper = new InstallHelper(umbCtx, InstallStatusType.NewInstall);
+            var helper = new InstallHelper(umbCtx);
 
-            var steps = helper.GetSteps().ToArray();
+            var steps = helper.GetAllSteps().ToArray();
             
             //for new installs 2, don't require execution
             Assert.AreEqual(2, steps.Count(x => x.RequiresExecution() == false));
@@ -86,9 +86,9 @@ namespace Umbraco.Tests.Install
                 appCtx,
                 true);
 
-            var helper = new InstallHelper(umbCtx, InstallStatusType.Upgrade);
-
-            var steps = helper.GetSteps().ToArray();
+            var helper = new InstallHelper(umbCtx);
+           
+            var steps = helper.GetAllSteps().ToArray();
 
             //for upgrades 4, don't require execution 
             Assert.AreEqual(4, steps.Count(x => x.RequiresExecution() == false));
diff --git a/src/Umbraco.Web.UI.Client/gruntFile.js b/src/Umbraco.Web.UI.Client/gruntFile.js
index 44b59d29d1..7ae0a96841 100644
--- a/src/Umbraco.Web.UI.Client/gruntFile.js
+++ b/src/Umbraco.Web.UI.Client/gruntFile.js
@@ -3,18 +3,18 @@ module.exports = function (grunt) {
   // Default task.
   grunt.registerTask('default', ['jshint:dev','build','karma:unit']);
   grunt.registerTask('dev', ['jshint:dev', 'build', 'webserver', 'open:dev', 'watch']);
-  
+
   //run by the watch task
   grunt.registerTask('watch-js', ['jshint:dev','concat','copy:app','copy:mocks','copy:packages','copy:vs','karma:unit']);
   grunt.registerTask('watch-less', ['recess:build','recess:installer','copy:assets','copy:vs']);
   grunt.registerTask('watch-html', ['copy:views', 'copy:vs']);
   grunt.registerTask('watch-packages', ['copy:packages']);
-  grunt.registerTask('watch-installer', ['concat:install','concat:installJs','copy:installer']);
+  grunt.registerTask('watch-installer', ['concat:install','concat:installJs','copy:installer', 'copy:vs']);
   grunt.registerTask('watch-test', ['jshint:dev', 'karma:unit']);
 
   //triggered from grunt dev or grunt
   grunt.registerTask('build', ['clean','concat','recess:min','recess:installer','copy']);
-  
+
   //utillity tasks
   grunt.registerTask('docs', ['ngdocs']);
   grunt.registerTask('webserver', ['connect:devserver']);
@@ -220,7 +220,7 @@ module.exports = function (grunt) {
         }
       }
     },
-    
+
     recess: {
       build: {
         files: {
@@ -321,7 +321,7 @@ module.exports = function (grunt) {
              //NOTE: we ignore tabs vs spaces because enforcing that causes lots of errors depending on the text editor being used
            smarttabs: true,
            globals:{}
-         } 
+         }
       },
       build:{
          files:['<%= src.prod %>'],
@@ -345,13 +345,13 @@ module.exports = function (grunt) {
            smarttabs: true,
            globalstrict:true,
            globals:{$:false, jQuery:false,define:false,require:false,window:false}
-         } 
+         }
       }
     }
   });
-  
 
-  
+
+
   grunt.loadNpmTasks('grunt-contrib-concat');
   grunt.loadNpmTasks('grunt-contrib-jshint');
   grunt.loadNpmTasks('grunt-contrib-clean');
@@ -361,7 +361,7 @@ module.exports = function (grunt) {
   grunt.loadNpmTasks('grunt-recess');
 
   grunt.loadNpmTasks('grunt-karma');
-  
+
   grunt.loadNpmTasks('grunt-open');
   grunt.loadNpmTasks('grunt-contrib-connect');
 
diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer.controller.js b/src/Umbraco.Web.UI.Client/src/installer/installer.controller.js
index b2e4c4f595..043e8d5152 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/installer.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/installer/installer.controller.js
@@ -16,4 +16,8 @@ angular.module("umbraco.install").controller("Umbraco.InstallerController",
 	$scope.install = function(){
 		installerService.install();
 	};
-});
\ No newline at end of file
+
+	$scope.gotoStep = function(step){
+		installerService.gotoNamedStep(step);
+	};
+});
diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer.html b/src/Umbraco.Web.UI.Client/src/installer/installer.html
index 1d421db01e..17a9abf84e 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/installer.html
+++ b/src/Umbraco.Web.UI.Client/src/installer/installer.html
@@ -13,7 +13,7 @@
 
     <img src="assets/img/application/logo_white.png" id="logo" />
 
-    <div class="umb-loader" id="loader" ></div>
+
 
     <div id="installer" class="absolute-center clearfix" ng-if="installer.current">
         <div ng-include="installer.current.view"></div>
@@ -24,4 +24,4 @@
     <script src="lib/yepnope/yepnope.min.js"></script>
     <script src="js/install.loader.js"></script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer.service.js b/src/Umbraco.Web.UI.Client/src/installer/installer.service.js
index 8f4c702d83..32215747c8 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/installer.service.js
+++ b/src/Umbraco.Web.UI.Client/src/installer/installer.service.js
@@ -1,5 +1,5 @@
 angular.module("umbraco.install").factory('installerService', function($q, $timeout, $http, $location){
-	
+
 	var _status = {
 		index: 0,
 		current: undefined,
@@ -13,10 +13,10 @@ angular.module("umbraco.install").factory('installerService', function($q, $time
         instructions: {
             DatabaseConfigure: { dbType: 0 },
             StarterKitDownload: Umbraco.Sys.ServerVariables.defaultStarterKit
-        }		
+        }
 	};
 
-    /* 
+    /*
         Returns the description for the step at a given index based on the order of the serverOrder of steps
         Since they don't execute on the server in the order that they are displayed in the UI.
     */
@@ -28,10 +28,22 @@ angular.module("umbraco.install").factory('installerService', function($q, $time
 	    return null;
 	}
 
+	function resolveView(view){
+
+		if(view.indexOf(".html") < 0){
+			view = view + ".html";
+		}
+		if(view.indexOf("/") < 0){
+			view = "views/install/" + view;
+		}
+
+		return view;
+	}
+
 	var service = {
 
 		status : _status,
-		
+
 		getPackages : function(){
 			return $http.get(Umbraco.Sys.ServerVariables.installApiBaseUrl + "GetPackages");
 		},
@@ -48,10 +60,10 @@ angular.module("umbraco.install").factory('installerService', function($q, $time
 					service.status.index = 0;
 					_installerModel.installId = response.data.installId;
 					service.findNextStep();
-					
+
 					$timeout(function(){
 						service.status.loading = false;
-						service.status.installing = true;
+						service.status.configuring = true;
 					}, 2000);
 				});
 			}
@@ -59,21 +71,35 @@ angular.module("umbraco.install").factory('installerService', function($q, $time
 
 		gotoStep : function(index){
 			var step = service.status.steps[index];
-			if(step.view.indexOf(".html") < 0){
-				step.view = step.view + ".html";
-			}
-			if(step.view.indexOf("/") < 0){
-				step.view = "views/install/" + step.view;
-			}
+			step.view = resolveView(step.view);
+
 			if(!step.model){
 				step.model = {};
 			}
+
 			service.status.index = index;
 			service.status.current = step;
+			service.retrieveCurrentStep();
+		},
+
+		gotoNamedStep : function(step){
+				var step = _.find(service.status.steps, function(s, index){
+					if(s.view && s.name === step){
+						service.status.index = index;
+						return true;
+					}
+				});
+
+				step.view = resolveView(step.view);
+				if(!step.model){
+					step.model = {};
+				}
+				service.retrieveCurrentStep();
+				service.status.current = step;
 		},
 
 		findNextStep : function(){
-			var step = _.find(service.status.steps, function(s, index){ 
+			var step = _.find(service.status.steps, function(s, index){
 				if(s.view && index >= service.status.index){
 					service.status.index = index;
 					return true;
@@ -93,12 +119,19 @@ angular.module("umbraco.install").factory('installerService', function($q, $time
 			}
 
 			service.status.current = step;
-		}, 
+			service.retrieveCurrentStep();
+		},
 
 		storeCurrentStep : function(){
 			_installerModel.instructions[service.status.current.name] = service.status.current.model;
 		},
 
+		retrieveCurrentStep : function(){
+			if(_installerModel.instructions[service.status.current.name]){
+					service.status.current.model = _installerModel.instructions[service.status.current.name];
+			}
+		},
+
 		forward : function(){
 			service.storeCurrentStep();
 			service.status.index++;
@@ -111,40 +144,69 @@ angular.module("umbraco.install").factory('installerService', function($q, $time
 		},
 
 		install : function(){
-			service.storeCurrentStep();
-			service.status.current = undefined;
-			service.status.feedback = [];
-			service.status.loading = true;
-
 			var feedback = 0;
+			service.storeCurrentStep();
+			service.switchToFeedback();
 			service.status.feedback = getDescriptionForStepAtIndex(service.status.steps, 0);
 
 			function processInstallStep(){
-				$http.post(Umbraco.Sys.ServerVariables.installApiBaseUrl + "PostPerformInstall", 
+				$http.post(Umbraco.Sys.ServerVariables.installApiBaseUrl + "PostPerformInstall",
 					_installerModel).then(function(response){
 						if(!response.data.complete){
 							feedback++;
 
-							var desc = getDescriptionForStepAtIndex(service.status.steps, feedback);							
-							if (desc) {
-							    service.status.feedback = desc;
-							}
+							if(response.data.view){
 
-							processInstallStep();
+								//set the current view and model to whatever the process returns, the view is responsible for retriggering install();
+								var v = resolveView(response.data.view);
+								service.status.current = {view: v, model: response.data.model};
+
+								//turn off loading bar and feedback
+								service.switchToConfiguration();
+							}else{
+								var desc = getDescriptionForStepAtIndex(service.status.steps, feedback);
+								if (desc) {
+										service.status.feedback = desc;
+								}
+
+								processInstallStep();
+							}
 						}else{
 							service.status.done = true;
-							service.status.feedback = undefined;
+							service.status.feedback = "Redirecting you to Umbraco, please wait";
 							service.status.loading = false;
 							service.complete();
 						}
+					}, function(err){
+							//this is where we handle installer error
+							var v = err.data.view ? resolveView(err.data.view) : resolveView("error");
+							var model = err.data.model ? err.data.model : err.data;
+
+							service.status.current = {view: v, model: model};
+							service.switchToConfiguration();
 					});
 			}
 			processInstallStep();
 		},
+
+		switchToFeedback : function(){
+			service.status.current = undefined;
+			service.status.loading = true;
+			service.status.configuring = false;
+		},
+
+		switchToConfiguration : function(){
+			service.status.loading = false;
+			service.status.configuring = true;
+			service.status.feedback = undefined;
+		},
+
 		complete : function(){
-			window.location.href = Umbraco.Sys.ServerVariables.umbracoBaseUrl;
+			$timeout(function(){
+				window.location.href = Umbraco.Sys.ServerVariables.umbracoBaseUrl;
+			}, 1500);
 		}
 	};
 
 	return service;
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/database.html b/src/Umbraco.Web.UI.Client/src/installer/steps/database.html
index fff2c33d1d..1035d32d8b 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/steps/database.html
+++ b/src/Umbraco.Web.UI.Client/src/installer/steps/database.html
@@ -1,16 +1,18 @@
 <div ng-controller="Umbraco.Installer.DataBaseController">
-	
+
 	<h1>Configure your database</h1>
 	<p>
-		Enter connection and authentication details for the database you want to install umbraco on
+		Enter connection and authentication details for the database you want to install Umbraco on
 	</p>
 
 	<form name="myForm" class="form-horizontal" novalidate ng-submit="validateAndForward();">
-		
+
+
 		<div class="control-group">
+			<legend>What type of database do you use?</legend>
 			<label class="control-label" for="dbType">Database type</label>
 			    <div class="controls">
-			    	<select name="dbType" ng-model="installer.current.model.dbType">
+			    	<select name="dbType" ng-model="installer.current.model.dbType" required>
 			    		<optgroup>
 			    			<option value="0">Embedded database SQL CE</option>
 			    			<option value="1">Microsft SQL Server</option>
@@ -23,75 +25,100 @@
 				</div>
 		</div>
 
-		<div class="control-group" ng-if="installer.current.model.dbType < 0">
-			<label class="control-label" for="server">Connection string</label>
-			    <div class="controls">
-				
-				<textarea class="input-block-level" required ng-model="installer.current.model.connectionString" rows="5">
-				</textarea>
 
-				<small class="inline-help">Enter a valid database connection string.</small>
+		<div ng-if="installer.current.model.dbType == 0">
+				<p>Great!, no need to configure anything then, you simply click the <strong>continue</strong> button below to continue to the next step</p>
+		</div>
+
+
+
+		<div ng-if="installer.current.model.dbType < 0">
+
+			<legend>What is the exact connectionstring we should use?</legend>
+			<div class="control-group">
+				<label class="control-label" for="server">Connection string</label>
+				  <div class="controls">
+
+					<textarea class="input-block-level" required ng-model="installer.current.model.connectionString" rows="5">
+					</textarea>
+					<small class="inline-help">Enter a valid database connection string.</small>
+				</div>
 			</div>
 		</div>
 
-		<div class="row" ng-if="installer.current.model.dbType > 0">	
-			
-			<div class="span6">
-				<div class="control-group">
-					<label class="control-label" for="server">Server</label>
-					<div class="controls">
-						<input type="text" name="server" placeholder="127.0.0.1/SQLEXPRESS" required ng-model="installer.current.model.server" />
-						<small class="inline-help">Enter the domain or IP your database server is located</small>
+		<div ng-if="installer.current.model.dbType > 0">
+				<div class="row">
+					<legend>Where do we find your database?</legend>
+					<div class="span6">
+						<div class="control-group">
+							<label class="control-label" for="server">Server</label>
+							<div class="controls">
+								<input type="text" name="server" placeholder="127.0.0.1/SQLEXPRESS" required ng-model="installer.current.model.server" />
+								<small class="inline-help">Enter server domain or IP</small>
+							</div>
+						</div>
+					</div>
+
+					<div class="span6">
+						<div class="control-group">
+							<label class="control-label" for="databaseName">Database name</label>
+							<div class="controls">
+								<input type="text" name="installer.current.model.databaseName"
+									placeholder="umbraco-cms"
+									required ng-model="installer.current.model.databaseName"  />
+								<small class="inline-help">Enter the name of the database</small>
+							</div>
+						</div>
 					</div>
 				</div>
 
-				<div class="control-group">
-					<label class="control-label" for="databaseName">Database name</label>
-					<div class="controls">
-						<input type="text" name="installer.current.model.databaseName"
-							placeholder="umbraco-cms" 
-							required ng-model="installer.current.model.databaseName"  />
-						<small class="inline-help">Enter the name of the database</small>
-					</div>
-				</div>
-			</div>	
 
-			<div class="span6">
-				<div class="control-group" ng-if="!installer.current.model.integratedAuth">
-					<label class="control-label" for="login">Login</label>
-					<div class="controls">
-						<input type="text" name="login"
-							placeholder="databaseuser" 
-							required ng-model="installer.current.model.login"  />
-						<small class="inline-help">Enter the database user name</small>
-					</div>
-				</div>
+				<div class="row">
+					  <legend>What credentials are used to access the database?</legend>
+						<div class="span6">
+							<div class="control-group" ng-if="!installer.current.model.integratedAuth">
+								<label class="control-label" for="login">Login</label>
+								<div class="controls">
+									<input type="text" name="login"
+										placeholder="databaseuser"
+										required ng-model="installer.current.model.login"  />
+									<small class="inline-help">Enter the database user name</small>
+								</div>
+							</div>
+						</div>
 
-				<div class="control-group" ng-if="!installer.current.model.integratedAuth">
-					<label class="control-label" for="password">Password</label>
-					<div class="controls">
-						<input type="password" name="password"
-							placeholder="umbraco-cms" 
-							required ng-model="installer.current.model.password"  />
-						<small class="inline-help">Enter the database password</small>
-					</div>
-				</div>
+						<div class="span6">
+							<div class="control-group" ng-if="!installer.current.model.integratedAuth">
+							<label class="control-label" for="password">Password</label>
+								<div class="controls">
+								<input type="password" name="password"
+									placeholder="umbraco-cms"
+									required ng-model="installer.current.model.password"  />
+									<small class="inline-help">Enter the database password</small>
+								</div>
+							</div>
+						</div>
 
-				<div class="control-group">
-					<label class="control-label" for="integratedAuth">Use intergrated authentication</label>
-					<div class="controls">
-						<input type="checkbox" name="integratedAuth"
-							placeholder="umbraco-cms" 
-							ng-model="installer.current.model.integratedAuth"  />
-					</div>
+						<div class="span12 control-group" ng-if="installer.current.model.dbType == 1">
+							<div class="controls">
+							<label class="checkbox" for="integratedAuth">
+								<input type="checkbox" name="integratedAuth"
+								placeholder="umbraco-cms"
+								ng-model="installer.current.model.integratedAuth"  /> Use intergrated authentication</label>
+							</div>
+						</div>
+			  </div>
+		</div>
+
+
+		<div class="row">
+			<div class="control-group" ng-class="{disabled:myForm.$invalid}">
+				<div class="controls">
+					<input type="submit" ng-disabled="myForm.$invalid"  value="Continue" class="btn btn-success" />
 				</div>
 			</div>
 		</div>
-			
-		<div class="control-group" ng-class="{disabled:myForm.$invalid}">	
-			<div class="controls">
-				<input type="submit" ng-disabled="myForm.$invalid"  value="Install" class="btn btn-success" />
-			</div>
-		</div>
+
+
 	</form>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/error.html b/src/Umbraco.Web.UI.Client/src/installer/steps/error.html
new file mode 100644
index 0000000000..5c4dabf96e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/installer/steps/error.html
@@ -0,0 +1,7 @@
+<div class="error">
+  <h1>Error during installation</h1>
+
+  <p class="message">{{installer.current.model.message}}</p>
+
+  <button class="btn btn-success" ng-click="gotoStep(installer.current.model.step)">Go back</button>
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html b/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html
index 62dd4518d6..4183df869d 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html
+++ b/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html
@@ -1,8 +1,9 @@
 <div ng-controller="Umbraco.Installer.PackagesController">
 	<h1>Install a starter website</h1>
+
 	<p>
-		Installing a starter website helps you learn how Umbraco works, and gives you a solid 
-		a simple foundation to build ontop of. 	
+		Installing a starter website helps you learn how Umbraco works, and gives you a solid
+		and simple foundation to build on top of.
 	</p>
 
 	<ul class="thumbnails">
@@ -10,8 +11,9 @@
 	    	<a href ng-click="installer.current.model = package.id; install()" class="thumbnail">
 	      		<img ng-src="http://our.umbraco.org{{package.thumbnail}}" alt="{{package.name}}">
 	    	</a>
-	  	</li>
+	  </li>
 	</ul>
 
-	<a href ng-click="forward()" class="btn btn-link">No thanks, I do not want to install a starter website</a> 
-</div>
\ No newline at end of file
+
+	<a href ng-click="install()" class="btn btn-link">No thanks, I do not want to install a starter website</a>
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/upgrade.html b/src/Umbraco.Web.UI.Client/src/installer/steps/upgrade.html
index 8cbff93233..ebbcd1d641 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/steps/upgrade.html
+++ b/src/Umbraco.Web.UI.Client/src/installer/steps/upgrade.html
@@ -1,3 +1,14 @@
 <div>
-    Start upgrade!
-</div>
\ No newline at end of file
+    <h1>Upgrading Umbraco</h1>
+    <p>
+        Welcome to the Umbraco installer. You see this screen because your Umbraco installation needs a quick upgrade of its database and files,
+        it is completely harmless and will simply ensure your website is kept as fast, secure and uptodate as possible.
+    </p>
+    <p>
+        Simply click <strong>continue</strong> below to be guided through the rest of the upgrade</p>
+    </p>
+
+    <p>
+        <button class="btn btn-success" ng-click="install()">Continue</button>
+   </p>
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/less/installer.less b/src/Umbraco.Web.UI.Client/src/less/installer.less
index 952649076c..e589315d49 100644
--- a/src/Umbraco.Web.UI.Client/src/less/installer.less
+++ b/src/Umbraco.Web.UI.Client/src/less/installer.less
@@ -19,8 +19,8 @@
 }
 
 
-html { 
-  background: url('../img/installer.jpg') no-repeat center center fixed; 
+html {
+  background: url('../img/installer.jpg') no-repeat center center fixed;
   -webkit-background-size: cover;
   -moz-background-size: cover;
   -o-background-size: cover;
@@ -32,7 +32,7 @@ body {
   padding: 0;
   height: 100%;
   width: 100%;
-  
+
   font-family: @baseFontFamily;
   font-size: @baseFontSize;
   line-height: @baseLineHeight;
@@ -53,15 +53,13 @@ body {
 #installer{
 	margin: auto;
 	background: white;
-	min-height: 400px;
-  min-width: 500px;
-  max-width: 700px;
-  
-  height: 500px;
-
-  padding: 40px;
+  width: 750px;
+  height: 550px;
+  text-align: left;
+  padding: 30px;
 }
 
+
 #overlay{
   position: absolute;
   top: 0;
@@ -72,6 +70,28 @@ body {
   z-index: 666;
 }
 
+#feedback{
+  color: #fff;
+  text-shadow: 0px 0px 4px black;
+  font-size: 40px;
+  text-align: center;
+  width: 750px;
+  height: 150px;
+  line-height: 60px;
+  z-index: 667;
+}
+
+
+h1{
+  border-bottom: 1px solid @grayLighter;
+  padding-bottom: 10px;
+  color: @gray;
+}
+
+.error h1, .error .message{ color: @red;}
+
+legend{font-size: 14px; font-weight: bold}
+
 input.ng-dirty.ng-invalid{border-color: #b94a48; color: #b94a48;}
 
 .disabled{
@@ -136,7 +156,7 @@ animation-duration:1s;
 animation-iteration-count:infinite;
 animation-timing-function:linear;
 width:100%;
-height:1px;
+height: 5px;
 }
 
 
@@ -194,10 +214,11 @@ height:1px;
 }
 
 //loader defaults
-.umb-loader{
+.umb-loader-container{
 	height: 5px;
   position: absolute;
   bottom: 0;
   left: 0;
   right: 0;
-}
\ No newline at end of file
+  overflow: hidden;
+}
diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/Views/Install/Index.cshtml b/src/Umbraco.Web.UI/Areas/UmbracoInstall/Views/Install/Index.cshtml
index 307d0316dc..8d5f89d6e0 100644
--- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/Views/Install/Index.cshtml
+++ b/src/Umbraco.Web.UI/Areas/UmbracoInstall/Views/Install/Index.cshtml
@@ -13,23 +13,26 @@
     <title>Install Umbraco</title>
     <link rel="stylesheet" href="assets/css/installer.css" />
 </head>
-    
+
 <body ng-class="{touch:touchDevice}" ng-controller="Umbraco.InstallerController" id="umbracoInstallPageBody">
 
     <img src="assets/img/application/logo_white.png" id="logo" />
 
-    @*<div class="umb-loader" id="loader" ng-if="installer.loading"></div>*@
+    <div class="umb-loader-container">
+        <div class="umb-loader" id="loader" ng-if="installer.loading"></div>
+    </div>
     
-    <div id="overlay" ng-animate="'fade'" ng-show="installer.done"></div>
+    <div id="overlay"  ng-cloak ng-animate="'fade'" ng-show="installer.done"></div>
 
     <div id="installer" class="absolute-center clearfix"
-        ng-cloak 
-        ng-animate="'fade'" 
-        ng-show="installer.installing">
+        ng-cloak
+        ng-animate="'fade'"
+        ng-show="installer.configuring">
         <div ng-if="installer.current" ng-include="installer.current.view"></div>
-        <h2 ng-animate="'fade'" ng-show="installer.feedback">{{installer.feedback}}...</h2>
     </div>
 
+    <h2 ng-cloak ng-animate="'fade'" id="feedback" class="absolute-center clearfix" ng-show="installer.feedback">{{installer.feedback}}</h2>
+
     <script type="text/javascript">
         var Umbraco = {};
         Umbraco.Sys = {};
@@ -42,4 +45,4 @@
     <script src="lib/yepnope/yepnope.min.js"></script>
     <script src="js/install.loader.js"></script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/Umbraco.Web.UI/config/ClientDependency.config b/src/Umbraco.Web.UI/config/ClientDependency.config
index 02486b0ff6..585ff05a10 100644
--- a/src/Umbraco.Web.UI/config/ClientDependency.config
+++ b/src/Umbraco.Web.UI/config/ClientDependency.config
@@ -10,7 +10,7 @@ NOTES:
 * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config
 * A new version will invalidate both client and server cache and create new persisted files
 --> 
-<clientDependency version="1999622582" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
+<clientDependency version="1678677019" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
 
   <!-- 
     This section is used for Web Forms only, the enableCompositeFiles="true" is optional and by default is set to true.
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 9b4cca03d2..f6434a19b5 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -63,13 +63,10 @@
   <area alias="auditTrails">
     <key alias="atViewingFor">Viewing for</key>
   </area>
-
-  
   <area alias="buttons">
     <key alias="select">Select</key>
     <key alias="selectCurrentFolder">Select current folder</key>
     <key alias="somethingElse">Do something else</key>
-    
     <key alias="bold">Bold</key>
     <key alias="deindent">Cancel Paragraph Indent</key>
     <key alias="formFieldInsert">Insert form field</key>
@@ -160,7 +157,6 @@
     <key alias="urls">Link to document</key>
     <key alias="memberof">Member of group(s)</key>
     <key alias="notmemberof">Not a member of group(s)</key>
-    
     <key alias="childItems" version="7.0">Child items</key>
     <key alias="target" version="7.0">Target</key>
   </area>
@@ -172,9 +168,7 @@
     <key alias="chooseNode">Where do you want to create the new %0%</key>
     <key alias="createUnder">Create an item under</key>
     <key alias="updateData">Choose a type and a title</key>
-
     <key alias="noDocumentTypes" version="7.0"><![CDATA[There are no allowed document types available. You must enable these in the settings section under <strong>"document types"</strong>.]]></key>
-
     <key alias="noMediaTypes" version="7.0"><![CDATA[There are no allowed media types available. You must enable these in the settings section under <strong>"media types"</strong>.]]></key>
   </area>
   <area alias="dashboard">
@@ -248,7 +242,6 @@
     <key alias="search">Type to search...</key>
     <key alias="filter">Type to filter...</key>
   </area>
-
   <area alias="editcontenttype">
     <key alias="allowedchildnodetypes">Allowed child nodetypes</key>
     <key alias="create">Create</key>
@@ -401,7 +394,6 @@
     <key alias="width">Width</key>
     <key alias="yes">Yes</key>
     <key alias="folder">Folder</key>
-
     <key alias="searchResults">Search results</key>
   </area>
   <area alias="graphicheadline">
@@ -549,12 +541,9 @@ To manage your website, simply open the umbraco back office and start adding con
     <key alias="greeting4">Happy thunder thursday</key>
     <key alias="greeting5">Happy friendly friday</key>
     <key alias="greeting6">Happy shiny saturday</key>
-    
     <key alias="instruction">log in below</key>
     <key alias="timeout">Session timed out</key>
-
     <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.org" style="text-decoration: none" target="_blank">umbraco.org</a></p> ]]></key>
-   
   </area>
   <area alias="main">
     <key alias="dashboard">Dashboard</key>
@@ -677,11 +666,9 @@ To manage your website, simply open the umbraco back office and start adding con
     <key alias="paSimpleHelp">If you just want to setup simple protection using a single login and password</key>
   </area>
   <area alias="publish">
-    <key alias="contentPublishedFailedAwaitingRelease">
-      <![CDATA[
+    <key alias="contentPublishedFailedAwaitingRelease"><![CDATA[
       %0% could not be published because the item is scheduled for release.
-    ]]>
-    </key>
+    ]]></key>
     <key alias="contentPublishedFailedInvalid"><![CDATA[
       %0% could not be published because these properties:  %1%  did not pass validation rules.
     ]]></key>
@@ -741,7 +728,6 @@ To manage your website, simply open the umbraco back office and start adding con
     <key alias="statistics">Statistics</key>
     <key alias="translation">Translation</key>
     <key alias="users">Users</key>
-
     <key alias="help" version="7.0">Help</key>
   </area>
   <area alias="settings">
@@ -993,9 +979,8 @@ To manage your website, simply open the umbraco back office and start adding con
     <key alias="usertype">User type</key>
     <key alias="userTypes">User types</key>
     <key alias="writer">Writer</key>
-
     <key alias="yourProfile" version="7.0">Your profile</key>
     <key alias="yourHistory" version="7.0">Your recent history</key>
     <key alias="sessionExpires" version="7.0">Session expires in</key>
   </area>
-</language>
+</language>
\ No newline at end of file
diff --git a/src/Umbraco.Web/Install/Controllers/InstallApiController.cs b/src/Umbraco.Web/Install/Controllers/InstallApiController.cs
index 015a72eec7..3eef2734e2 100644
--- a/src/Umbraco.Web/Install/Controllers/InstallApiController.cs
+++ b/src/Umbraco.Web/Install/Controllers/InstallApiController.cs
@@ -180,18 +180,28 @@ namespace Umbraco.Web.Install.Controllers
                             ex = ex.InnerException;
                         }
 
+                        //return custom view if we have an install exception
                         var installException = ex as InstallException;
                         if (installException != null)
                         {
                             return Json(new
                             {
+                                step = step.Name,
                                 view = installException.View,
                                 model = installException.ViewModel,
                                 message = installException.Message
                             }, HttpStatusCode.BadRequest);
                         }
 
-                        return Request.CreateValidationErrorResponse("An error occurred executing the step: " + step.Name + ". Error: " + ex.Message);
+                        //return standard view + step and message to display generic message
+                        return Json(new
+                        {
+                            step = step.Name,
+                            view = "error",
+                            message = ex.Message
+                        }, HttpStatusCode.BadRequest);
+
+                        //return Request.CreateValidationErrorResponse("An error occurred executing the step: " + step.Name + ". Error: " + ex.Message);
                     }
                 }
             }