diff --git a/couchpotato/core/plugins/wizard/static/wizard.css b/couchpotato/core/plugins/wizard/static/wizard.css
index 9688f874..0ac59336 100644
--- a/couchpotato/core/plugins/wizard/static/wizard.css
+++ b/couchpotato/core/plugins/wizard/static/wizard.css
@@ -17,7 +17,7 @@
 .page.wizard .tab_wrapper {
 	background: #5c697b;
 	padding: 18px 0;
-	font-size: 27px;
+	font-size: 23px;
 	position: fixed;
 	top: 0;
 	margin: 0;
@@ -57,6 +57,9 @@
 	margin: 20px 0 160px;
 }
 
+.page.wizard form > div {
+	min-height: 300px;
+}
 .page.wizard .wgroup_finish {
 	height: 300px;
 }
diff --git a/couchpotato/core/plugins/wizard/static/wizard.js b/couchpotato/core/plugins/wizard/static/wizard.js
index 135e0747..c080769a 100644
--- a/couchpotato/core/plugins/wizard/static/wizard.js
+++ b/couchpotato/core/plugins/wizard/static/wizard.js
@@ -7,6 +7,10 @@ Page.Wizard = new Class({
 	wizard_only: true,
 
 	headers: {
+		'welcome': {
+			'title': 'Welcome to CouchPotato',
+			'description': 'To get started, fill in each of the following settings as much as your can.'
+		},
 		'general': {
 			'title': 'General',
 			'description': 'If you want to access CP from outside your local network, you better secure it a bit with a username & password.'
@@ -52,7 +56,7 @@ Page.Wizard = new Class({
 			)
 		}
 	},
-	groups: ['general', 'downloaders', 'searcher', 'providers', 'renamer', 'finish'],
+	groups: ['welcome', 'general', 'downloaders', 'searcher', 'providers', 'renamer', 'finish'],
 
 	open: function(action, params){
 		var self = this;
@@ -114,12 +118,13 @@ Page.Wizard = new Class({
 			if(tab_navigation && group_container){
 				tab_navigation.inject(tabs); // Tab navigation
 				self.el.getElement('.tab_'+group).inject(group_container); // Tab content
+				if(self.headers[group]) tab_navigation.getElement('a').set('text', (self.headers[group].label || group).capitalize());
 			}
 			else {
 				new Element('li.t_'+group).adopt(
 					new Element('a', {
 						'href': App.createUrl('wizard/'+group),
-						'text': group.capitalize()
+						'text': (self.headers[group].label || group).capitalize()
 					})
 				).inject(tabs);
 			}
diff --git a/couchpotato/static/style/page/settings.css b/couchpotato/static/style/page/settings.css
index 37be543b..72f1bc84 100644
--- a/couchpotato/static/style/page/settings.css
+++ b/couchpotato/static/style/page/settings.css
@@ -141,7 +141,7 @@
 				float: none;
 				width: auto;
 				display: inline-block;
-				margin-left: 1% !important;
+				padding-left: 1% !important;
 				height: 24px;
 				vertical-align: middle;
 			}