diff --git a/src/main/java/com/commafeed/frontend/pages/WelcomePage.html b/src/main/java/com/commafeed/frontend/pages/WelcomePage.html
index 0b25aeb1..5b128471 100644
--- a/src/main/java/com/commafeed/frontend/pages/WelcomePage.html
+++ b/src/main/java/com/commafeed/frontend/pages/WelcomePage.html
@@ -2,51 +2,78 @@
 <html xmlns:wicket="http://wicket.apache.org">
 <body>
 	<wicket:extend>
-		<div class="container welcome">
-			<div class="row header">
-				<div class="pull-right tagline">
-					Bloat-free feed reader
+		<div class="welcome">
+			<div class="container-fluid">
+				<div class="row-fluid header">
+					<div class="pull-left">
+						<a wicket:id="logo-link">
+							<img src="images/logo_2.png"></img>
+						</a>
+					</div>
+					<div class="pull-right tagline">Bloat-free feed reader</div>
+					<div class="text-center">
+						<a wicket:id="demo-login">
+							<img src="images/preview.jpg" class="preview" />
+							<br />
+							<span class="demo">
+								Try out the demo
+								<br />
+								<small>(some features are disabled)</small>
+							</span>
+						</a>
+					</div>
 				</div>
-				<div>
-					<a wicket:id="logo-link">
-						<img src="images/logo_2.png"></img>
-					</a>
+				<div class="row-fluid">
+					<div class="span6">
+						<div class="well" id="login-panel">
+							<h3>Login</h3>
+							<span wicket:id="login"></span>
+						</div>
+					</div>
+					<div class="span6" wicket:enclosure="register">
+						<div class="well" id="register-panel">
+							<h3>Register</h3>
+							<span wicket:id="register"></span>
+						</div>
+					</div>
 				</div>
-				<div class="text-center">
-					<a wicket:id="demo-login">
-						<img src="images/preview.jpg" class="preview" />
-						<br />
-						<span class="demo">
-							Try out the demo <br />
-							<small>(some features are disabled)</small>
+
+				<hr />
+				<div class="footer">
+					<div class="row-fluid">
+						<span>
+							&copy;
+							<a href="http://www.commafeed.com" target="_blank">CommaFeed</a>
+						</span>
+						<span>
+							- Sources on
+							<a href="https://github.com/Athou/commafeed" target="_blank">GitHub</a>
+						</span>
+						<span>
+							- REST API
+							<a href="api" target="_blank">documentation</a>
+						</span>
+						<span class="pull-right">
+							<a href="https://twitter.com/CommaFeed"
+								class="twitter-follow-button" data-show-count="false"
+								data-size="large">Follow @CommaFeed</a>
+							<script>
+								!function(d, s, id) {
+									var js, fjs = d.getElementsByTagName(s)[0], p = /^http:/
+											.test(d.location) ? 'http'
+											: 'https';
+									if (!d.getElementById(id)) {
+										js = d.createElement(s);
+										js.id = id;
+										js.src = p
+												+ '://platform.twitter.com/widgets.js';
+										fjs.parentNode.insertBefore(js, fjs);
+									}
+								}(document, 'script', 'twitter-wjs');
+							</script>
 						</span>
-					</a>
-				</div>
-			</div>
-			<div class="row">
-				<div class="span6">
-					<div class="well" id="login-panel">
-						<h3>Login</h3>
-						<span wicket:id="login"></span>
 					</div>
 				</div>
-				<div class="span6" wicket:enclosure="register">
-					<div class="well" id="register-panel">
-						<h3>Register</h3>
-						<span wicket:id="register"></span>
-					</div>
-				</div>
-			</div>
-	
-			<hr />
-			<div class="footer">
-				<span>&copy; <a href="http://www.commafeed.com" target="_blank">CommaFeed</a></span>
-				<span> - Sources on <a href="https://github.com/Athou/commafeed" target="_blank">GitHub</a></span>
-				<span> - REST API <a href="api" target="_blank">documentation</a></span>
-				<span class="pull-right">
-					<a href="https://twitter.com/CommaFeed" class="twitter-follow-button" data-show-count="false" data-size="large">Follow @CommaFeed</a>
-					<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
-				</span>
 			</div>
 		</div>
 	</wicket:extend>
diff --git a/src/main/webapp/sass/generic/_misc.scss b/src/main/webapp/sass/generic/_misc.scss
index 877152dd..ba5cb8f6 100644
--- a/src/main/webapp/sass/generic/_misc.scss
+++ b/src/main/webapp/sass/generic/_misc.scss
@@ -11,6 +11,12 @@
 	line-height: 20px
 }
 
+.welcome .container-fluid {
+	margin-right: auto;
+	margin-left: auto;
+	max-width: 950px;
+}
+
 .welcome .header {
 	margin: 20px 0 40px 0;
 }
@@ -49,4 +55,4 @@
 .favicon {
 	width: 16px;
 	height: 16px;
-}
+}
\ No newline at end of file
