diff --git a/index.php b/index.php
index ee3954e..e920211 100644
--- a/index.php
+++ b/index.php
@@ -24,7 +24,7 @@ $(document).ready(function()
 <body>
 
 <div id="container">
-<h1><a href="<?php echo YOURLS_SITE; ?>">kwl.me</a></h1>
+<h1><a href="<?php echo YOURLS_SITE; ?>"><?php echo INFINITYSQUARED_NAME; ?></a></h1>
 <ul class="menu">
 	<li><a href="http://tomslominski.net/">Blog</a></li>
 	<li><a href="http://local.tomslominski.net/">Local</a></li>
@@ -56,7 +56,7 @@ $(document).ready(function()
 		<h2>Share</h2>
 		<p>Share your short URL</p>
 		<a href="http://twitter.com/share" class="twitter-share-button" data-url="$shorturl" data-text="$keyword" data-count="vertical">Tweet</a><script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
-		<iframe src="http://www.facebook.com/plugins/like.php?href=$shorturl&amp;send=false&amp;layout=box_count&amp;width=50&amp;show_faces=false&amp;action=like&amp;colorscheme=light&amp;font&amp;height=90" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:55px; height:60px;" allowTransparency="true"></iframe>
+		<a href="#" class="share-button" onClick="facebook=window.open('http://facebook.com/sharer.php?u=$shorturl&t=$title','facebook','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=no,width=626,height=436,left=0,top=0'); return false;"><img src="public/img/facebook.png" alt="Share on Facebook" /></a>
 RESULT;
 
 	// Part to be executed when no form has been submitted
diff --git a/public/img/facebook.png b/public/img/facebook.png
new file mode 100644
index 0000000..ae98d7e
Binary files /dev/null and b/public/img/facebook.png differ
diff --git a/public/public.css b/public/public.css
index eddd5f5..5b28ed8 100644
--- a/public/public.css
+++ b/public/public.css
@@ -120,7 +120,10 @@ h1 a:visited {
 }
 .output a:hover {
 	border-bottom: #013F6D 1px dashed;
-}	
+}
+.share-button, .twitter-share-button {
+	padding-right:3px;
+}
 /* Footer */
 .footer {
 	text-align:center;
