diff --git a/footer.php b/footer.php
index da1d47a..6e0219a 100644
--- a/footer.php
+++ b/footer.php
@@ -1,5 +1,5 @@
-</div>
-<div class="paragraph">
+
+<div class="content">
 	<h2><?php yourls_e( 'The bookmarklet', 'isq_translation') ?></h2>
 
 	<?php $bookmarkletdialog = yourls__( 'Save this as a bookmark', 'isq_translation') // Can't put it where it belongs as there'd be too much char escaping ?>
@@ -8,7 +8,7 @@
 	<p><?php yourls_e( 'Support for bookmarklets on mobile varies. For example, they work on Chrome for Android but you have to add and sync them from your desktop.', 'isq_translation') ?></p>
 </div>
 
-<div class="footer">
+<div class="content footer">
 	<p><?php yourls_e( 'Powered by <a href="http://yourls.org/">YOURLS</a>. Design by <a href="http://tomslominski.net/">Tom Slominski</a>. Also used: <a href="http://formalize.me/">Formalize</a> and <a href="http://qtip2.com/">qTip²</a>. Find this theme on <a href="https://github.com/tomslominski/infinity-squared">GitHub</a>.', 'isq_translation') ?></p>
 </div>
 </div>
diff --git a/header.php b/header.php
index bf8c008..673d6f8 100644
--- a/header.php
+++ b/header.php
@@ -112,8 +112,3 @@ isq_load_textdomain();
 					?>
 				</ul>
 			</header>
-
-
-<div id="container">
-	
-	<div class="paragraph">
diff --git a/index.php b/index.php
index 4e4c52d..a72ebca 100644
--- a/index.php
+++ b/index.php
@@ -6,15 +6,17 @@ $title   = isset( $_REQUEST['title'] ) ? yourls_sanitize_title( $_REQUEST['title
 
 ?>
 
-<h2><?php yourls_e( 'Enter a new URL to shorten', 'isq_translation'); ?></h2>
-<h3><?php yourls_e( 'Hover over the labels to see more information', 'isq_translation'); ?></h3>
-<form method="post" action="result.php">
-	<p><label for="url" title="<?php yourls_e( 'Paste the long URL here', 'isq_translation'); ?>"><?php yourls_e( 'Long URL (required):', 'isq_translation'); ?></label> <input type="text" id="url" class="right" name="url" value="<?php echo($url); ?>" /></p>
-	<p><label for="keyword" title="<?php yourls_e( 'A keyword replaces the default short string', 'isq_translation'); ?>"><?php yourls_e( 'Custom keyword:', 'isq_translation'); ?></label> <input type="text" id="keyword" class="right" name="keyword" value="<?php echo($keyword); ?>" /></p>
-	<p><label for="title" title="<?php yourls_e( 'Optional title used when sharing a link from YOURLS using social sharers', 'isq_translation'); ?>"><?php yourls_e( 'Optional title:', 'isq_translation'); ?></label> <input type="text" id="title" class="right" name="title" value="<?php echo($title); ?>" /></p>
-	<div class="recaptcha-container"><label title="<?php yourls_e( 'Verification used to ensure the user is not a bot', 'isq_translation'); ?>"><?php yourls_e( 'reCAPTCHA:', 'isq_translation'); ?></label> <div class="g-recaptcha right" data-sitekey="<?php echo ISQ::$recaptcha['sitekey']; ?>"></div></div>
+<div class="content">
+	<h2><?php yourls_e( 'Enter a new URL to shorten', 'isq_translation'); ?></h2>
+	<h3><?php yourls_e( 'Hover over the labels to see more information', 'isq_translation'); ?></h3>
+	<form method="post" action="result.php">
+		<p><label for="url" title="<?php yourls_e( 'Paste the long URL here', 'isq_translation'); ?>"><?php yourls_e( 'Long URL (required):', 'isq_translation'); ?></label> <input type="text" id="url" class="right" name="url" value="<?php echo($url); ?>" /></p>
+		<p><label for="keyword" title="<?php yourls_e( 'A keyword replaces the default short string', 'isq_translation'); ?>"><?php yourls_e( 'Custom keyword:', 'isq_translation'); ?></label> <input type="text" id="keyword" class="right" name="keyword" value="<?php echo($keyword); ?>" /></p>
+		<p><label for="title" title="<?php yourls_e( 'Optional title used when sharing a link from YOURLS using social sharers', 'isq_translation'); ?>"><?php yourls_e( 'Optional title:', 'isq_translation'); ?></label> <input type="text" id="title" class="right" name="title" value="<?php echo($title); ?>" /></p>
+		<div class="recaptcha-container"><label title="<?php yourls_e( 'Verification used to ensure the user is not a bot', 'isq_translation'); ?>"><?php yourls_e( 'reCAPTCHA:', 'isq_translation'); ?></label> <div class="g-recaptcha right" data-sitekey="<?php echo ISQ::$recaptcha['sitekey']; ?>"></div></div>
 
-	<p><input type="submit" value="<?php yourls_e( 'Shorten', 'isq_translation'); ?>" /></p>
-</form>
+		<p><input type="submit" value="<?php yourls_e( 'Shorten', 'isq_translation'); ?>" /></p>
+	</form>
+</div>
 
 <?php include('footer.php'); ?>
diff --git a/public/style.css b/public/style.css
index 897abca..f08b052 100644
--- a/public/style.css
+++ b/public/style.css
@@ -81,9 +81,8 @@ p, a {
 
 /* Header */
 header {
-	width: 95%;
-	padding: 2.5%;
 	margin: 0 auto;
+	padding-top: 10px;
 }
 
 h1 {
@@ -150,8 +149,8 @@ h1 a:hover {
 }
 
 /* Main style */
-.paragraph {
-	padding: 0 2.5% 0 2.5%;
+.content {
+	background: white;
 }
 
 h2 {