diff --git a/website/base.css b/website/base.css
index b1d7ef23..d00c8fdd 100644
--- a/website/base.css
+++ b/website/base.css
@@ -34,7 +34,10 @@ hr {
 
 .navigation {
 	font: 11px Verdana, Arial, Helvetica, sans-serif;
+	position: absolute;
 	width: 120px;
+	top: 36px;
+	right: -40px;
 	opacity: 0.8;
 }
 
@@ -150,7 +153,7 @@ h1 .description {
 .social {
 	float: right;
 	position: relative;
-	right: -20px;
+	right: -30px;
 	top: -15px;
 }
 
@@ -158,6 +161,17 @@ h1 .description {
 	float: right;
 }
 
+.social .plusone {
+	position: relative;
+	left: 20px;
+	top: 1px;
+}
+
+.social .twitter {
+	position: relative;
+	top: 3px;
+}
+
 .screenshot {
 	float: right;
 	background-color: #E6E6E6;
diff --git a/website/cli.html b/website/cli.html
index 5e95eef8..6d89f446 100644
--- a/website/cli.html
+++ b/website/cli.html
@@ -39,16 +39,12 @@
 
 		<!-- twitter -->
 		<script type="text/javascript">
-		  (function() {
-			var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
-			po.src = 'http://platform.twitter.com/widgets.js';
-			var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
-		  })();
+			!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");
 		</script>
 	</head>
 	<body>
 		<div class="page">
-			<div class="navigation" style="position:absolute; top:36px; right:-40px">
+			<div class="navigation">
 				<div>
 				<ul>
 					<li><a href="http://filebot.sourceforge.net/forums/">Forums</a></li>
@@ -59,10 +55,10 @@
 			</div>
 
 			<div class="social">
-				<div class="twitter" style="position:relative; top:3px;">
-					<a href="https://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="filebot_renamer" data-url="http://filebot.sourceforge.net/"></a>
+				<div class="twitter">
+					<a href="https://twitter.com/share" class="twitter-share-button" data-url="http://filebot.sourceforge.net/" data-text="FileBot - The ultimate tv renamer and subtitle downloader" data-via="filebot_renamer" data-lang="en"></a>
 				</div>
-				<div class="plusone" style="position:relative; left:25px; top:1px">
+				<div class="plusone">
 					<g:plusone callback="_gaq.push(['_trackEvent','Social networking','Google Plus One',document.title])" href="http://filebot.sourceforge.net/"></g:plusone>
 				</div>
 			</div>
diff --git a/website/code.css b/website/code.css
index 59c5be7a..1024017d 100644
--- a/website/code.css
+++ b/website/code.css
@@ -1,7 +1,7 @@
 
 code {
 	display: block;
-	font-family: Arial, Helvetica, sans-serif;
+	font-family: monospace;
 	line-height: 1.2em;
 	background-color: #f5f5f5;
 	border: thin dashed #a2a2a2;
diff --git a/website/index.html b/website/index.html
index 09c9a0f6..43cd9962 100644
--- a/website/index.html
+++ b/website/index.html
@@ -39,16 +39,12 @@
 		
 		<!-- twitter -->
 		<script type="text/javascript">
-		  (function() {
-			var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
-			po.src = 'http://platform.twitter.com/widgets.js';
-			var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
-		  })();
+			!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");
 		</script>
 	</head>
 	<body>
 		<div class="page" style="background-image: url('images/bg.hint.tutorial.png'); background-position: 565px 122px;">
-			<div class="navigation" style="position:absolute; top:36px; right:-40px">
+			<div class="navigation">
 				<div>
 				<ul>
 					<li><a href="http://filebot.sourceforge.net/forums/">Forums</a></li>
@@ -59,10 +55,10 @@
 			</div>
 
 			<div class="social">
-				<div class="twitter" style="position:relative; top:3px;">
-					<a href="https://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="filebot_renamer" data-url="http://filebot.sourceforge.net/"></a>
+				<div class="twitter">
+					<a href="https://twitter.com/share" class="twitter-share-button" data-url="http://filebot.sourceforge.net/" data-text="FileBot - The ultimate tv renamer and subtitle downloader" data-via="filebot_renamer" data-lang="en"></a>
 				</div>
-				<div class="plusone" style="position:relative; left:25px; top:1px">
+				<div class="plusone">
 					<g:plusone callback="_gaq.push(['_trackEvent','Social networking','Google Plus One',document.title])" href="http://filebot.sourceforge.net/"></g:plusone>
 				</div>
 			</div>
diff --git a/website/naming.html b/website/naming.html
index 27bd7fc9..1f2e53b3 100644
--- a/website/naming.html
+++ b/website/naming.html
@@ -39,16 +39,12 @@
 		
 		<!-- twitter -->
 		<script type="text/javascript">
-		  (function() {
-			var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
-			po.src = 'http://platform.twitter.com/widgets.js';
-			var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
-		  })();
+			!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");
 		</script>
 	</head>
 	<body>
 		<div class="page">
-			<div class="navigation" style="position:absolute; top:36px; right:-40px">
+			<div class="navigation">
 				<div>
 				<ul>
 					<li><a href="http://filebot.sourceforge.net/forums/">Forums</a></li>
@@ -59,10 +55,10 @@
 			</div>
 
 			<div class="social">
-				<div class="twitter" style="position:relative; top:3px;">
-					<a href="https://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="filebot_renamer" data-url="http://filebot.sourceforge.net/"></a>
+				<div class="twitter">
+					<a href="https://twitter.com/share" class="twitter-share-button" data-url="http://filebot.sourceforge.net/" data-text="FileBot - The ultimate tv renamer and subtitle downloader" data-via="filebot_renamer" data-lang="en"></a>
 				</div>
-				<div class="plusone" style="position:relative; left:25px; top:1px">
+				<div class="plusone">
 					<g:plusone callback="_gaq.push(['_trackEvent','Social networking','Google Plus One',document.title])" href="http://filebot.sourceforge.net/"></g:plusone>
 				</div>
 			</div>
diff --git a/website/script.html b/website/script.html
index e4296273..ad437af7 100644
--- a/website/script.html
+++ b/website/script.html
@@ -39,16 +39,12 @@
 		
 		<!-- twitter -->
 		<script type="text/javascript">
-		  (function() {
-			var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
-			po.src = 'http://platform.twitter.com/widgets.js';
-			var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
-		  })();
+			!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");
 		</script>
 	</head>
 	<body>
 		<div class="page">
-			<div class="navigation" style="position:absolute; top:36px; right:-40px">
+			<div class="navigation">
 				<div>
 				<ul>
 					<li><a href="http://filebot.sourceforge.net/forums/">Forums</a></li>
@@ -59,10 +55,10 @@
 			</div>
 
 			<div class="social">
-				<div class="twitter" style="position:relative; top:3px;">
-					<a href="https://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="filebot_renamer" data-url="http://filebot.sourceforge.net/"></a>
+				<div class="twitter">
+					<a href="https://twitter.com/share" class="twitter-share-button" data-url="http://filebot.sourceforge.net/" data-text="FileBot - The ultimate tv renamer and subtitle downloader" data-via="filebot_renamer" data-lang="en"></a>
 				</div>
-				<div class="plusone" style="position:relative; left:25px; top:1px">
+				<div class="plusone">
 					<g:plusone callback="_gaq.push(['_trackEvent','Social networking','Google Plus One',document.title])" href="http://filebot.sourceforge.net/"></g:plusone>
 				</div>
 			</div>
