diff --git a/.gitignore b/.gitignore
index 0981b45f552c..5bc74ae5bab7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@
 /bootstrap/compiled.php
 /bootstrap/environment.php
 /vendor
+/.env.development.php
 /composer.phar
 /composer.lock
 /.DS_Store
diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index ef1363aa7f79..d82c2ebccf32 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -516,7 +516,7 @@ class AccountController extends \BaseController {
 			$account->date_format_id = Input::get('date_format_id') ? Input::get('date_format_id') : null;
 			$account->datetime_format_id = Input::get('datetime_format_id') ? Input::get('datetime_format_id') : null;
 			$account->currency_id = Input::get('currency_id') ? Input::get('currency_id') : 1; // US Dollar
-			$account->language_id = Input::get('language_id') ? Input::get('language_id') : 1; // English
+			//$account->language_id = Input::get('language_id') ? Input::get('language_id') : 1; // English
 			$account->save();
 
 			$user = Auth::user();
diff --git a/app/routes.php b/app/routes.php
index ff83260e0141..4db3a8cfc8f4 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -1,7 +1,6 @@
 <?php
 
 
-
 /*
 |--------------------------------------------------------------------------
 | Application Routes
@@ -175,7 +174,7 @@ HTML::macro('breadcrumbs', function() {
 
 
 define('CONTACT_EMAIL', 'contact@invoiceninja.com');
-define('ANALYTICS_KEY', 'UA-46031341-1');
+//define('ANALYTICS_KEY', 'UA-46031341-1');
 
 define('ENV_DEVELOPMENT', 'local');
 define('ENV_STAGING', 'staging');
diff --git a/app/views/accounts/details.blade.php b/app/views/accounts/details.blade.php
index bf8df2a95763..692d0b33e769 100755
--- a/app/views/accounts/details.blade.php
+++ b/app/views/accounts/details.blade.php
@@ -63,8 +63,8 @@
 			{{ Former::text('phone') }}
 
 			{{ Former::legend('Localization') }}
-			{{ Former::select('language_id')->addOption('','')->label('Language')
-				->fromQuery($languages, 'name', 'id') }}			
+			{{-- Former::select('language_id')->addOption('','')->label('Language')
+				->fromQuery($languages, 'name', 'id') --}}			
 			{{ Former::select('currency_id')->addOption('','')->label('Currency')
 				->fromQuery($currencies, 'name', 'id') }}			
 			{{ Former::select('timezone_id')->addOption('','')->label('Timezone')
diff --git a/app/views/accounts/notifications.blade.php b/app/views/accounts/notifications.blade.php
index e8f4939bdf36..3dd004f7394c 100755
--- a/app/views/accounts/notifications.blade.php
+++ b/app/views/accounts/notifications.blade.php
@@ -20,21 +20,18 @@
 		<label for="invoice_terms" class="control-label col-lg-4 col-sm-4"></label>
 		<div class="col-lg-8 col-sm-8">
 
+			<div id="fb-root"></div>
+			<script>(function(d, s, id) {
+			  var js, fjs = d.getElementsByTagName(s)[0];
+			  if (d.getElementById(id)) return;
+			  js = d.createElement(s); js.id = id;
+			  js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=635126583203143";
+			  fjs.parentNode.insertBefore(js, fjs);
+			}(document, 'script', 'facebook-jssdk'));</script>
 
-		<div id="fb-root"></div>
-		<script>(function(d, s, id) {
-		  var js, fjs = d.getElementsByTagName(s)[0];
-		  if (d.getElementById(id)) return;
-		  js = d.createElement(s); js.id = id;
-		  js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=635126583203143";
-		  fjs.parentNode.insertBefore(js, fjs);
-		}(document, 'script', 'facebook-jssdk'));</script>
-
-		<div class="fb-follow" data-href="https://www.facebook.com/invoiceninja" data-colorscheme="light" data-layout="button" data-show-faces="false"></div>
-		<div style="padding-left: 70px">	      
+			<div class="fb-follow" data-href="https://www.facebook.com/invoiceninja" data-colorscheme="light" data-layout="button" data-show-faces="false"></div>&nbsp;&nbsp;
 	  	<a href="https://twitter.com/invoiceninja" class="twitter-follow-button" data-show-count="false" data-size="medium">Follow @invoiceninja</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>
-	  </div>
 
   </div></div>
 
diff --git a/app/views/master.blade.php b/app/views/master.blade.php
index 88230779a104..0007b13cd929 100755
--- a/app/views/master.blade.php
+++ b/app/views/master.blade.php
@@ -45,14 +45,14 @@
 
   <body>
 
-  @if (App::environment() == ENV_PRODUCTION)  
+  @if (App::environment() == ENV_PRODUCTION && isset($_ENV['ANALYTICS_KEY']) && $_ENV['ANALYTICS_KEY'])  
     <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
       m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
       })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 
-      ga('create', ANALYTICS_KEY);
+      ga('create', '{{ $_ENV['ANALYTICS_KEY'] }}');
       ga('send', 'pageview');
     </script>
   @endif
diff --git a/app/views/public/header.blade.php b/app/views/public/header.blade.php
index 036eecb02ac0..49f74f4b40f9 100644
--- a/app/views/public/header.blade.php
+++ b/app/views/public/header.blade.php
@@ -75,32 +75,26 @@
           <!--<a href="https://twitter.com/invoiceninja" class="twitter-follow-button" data-show-count="false" data-size="large">Follow @invoiceninja</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>-->
           <div class="fb-like" data-href="https://www.invoiceninja.com" data-layout="button" data-action="like" data-show-faces="false" data-share="false"></div>          
+          &nbsp;
 
-          <div style="padding-left: 58px">
-            <a href="https://twitter.com/share" class="twitter-share-button" data-url="https://www.invoiceninja.com/" data-via="invoiceninja" data-related="hillelcoren" data-count="none" data-text="Free online invoicing">Tweet</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>
-            &nbsp;
-            <!-- Place this tag where you want the +1 button to render. -->
-            <div class="g-plusone" data-size="medium" data-width="300" data-href="https://www.invoiceninja.com/" data-annotation="none" data-count="false" data-recommendations="false"></div>
+          <a href="https://twitter.com/share" class="twitter-share-button" data-url="https://www.invoiceninja.com/" data-via="invoiceninja" data-related="hillelcoren" data-count="none" data-text="Free online invoicing">Tweet</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>
+          &nbsp;
+          <!-- Place this tag where you want the +1 button to render. -->
+          <div class="g-plusone" data-size="medium" data-width="300" data-href="https://www.invoiceninja.com/" data-annotation="none" data-count="false" data-recommendations="false"></div>
+
+          <!-- Place this tag after the last +1 button tag. -->
+          <script type="text/javascript">
+            (function() {
+              var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
+              po.src = 'https://apis.google.com/js/platform.js';
+              var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
+            })();
+          </script>       
+          &nbsp;
+
+          <!--<iframe src="http://ghbtns.com/github-btn.html?user=hillelcoren&repo=invoice-ninja&type=watch" allowtransparency="true" frameborder="0" scrolling="0" width="62" height="20"></iframe>-->
 
-            <!-- Place this tag after the last +1 button tag. -->
-            <script type="text/javascript">
-              (function() {
-                var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
-                po.src = 'https://apis.google.com/js/platform.js';
-                var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
-              })();
-            </script>          
-          </div>
-<!--
-<a href="http://twitter.com/eas_id"><span class=
-"socicon">c</span></a> 
-<a href=
-"http://facebook.com/invoiceninja" target="_blank"><span class=
-"socicon">b</span></a> <a href=
-"http://twitter.com/invoiceninja" target="_blank"><span class=
-"socicon">a</span></a>
--->
   <p>&nbsp;</p>
   <p>Copyright © 2014 InvoiceNinja. All rights reserved.</p>
 </div> 
diff --git a/public/css/splash.css b/public/css/splash.css
index b086c8f99983..23e9c34d4e75 100644
--- a/public/css/splash.css
+++ b/public/css/splash.css
@@ -529,10 +529,8 @@ footer .social .socicon {
 }
 
 div.fb_iframe_widget {
-    position: absolute !important;
-    display: inline-block;
+    display: inline;
 }
-
 div.fb_iframe_widget > span {
     vertical-align: top !important;  
 }
diff --git a/public/css/style.css b/public/css/style.css
index 333d1644b2b3..fa13e78efc23 100755
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -620,12 +620,12 @@ border-color: #08273c;
     cursor: pointer;
 }
 div.fb_iframe_widget {
-    position: absolute !important;
-    display: inline-block;
+    display: inline;
 }
 div.fb_iframe_widget > span {
     vertical-align: top !important;  
 }
+
 @media (max-width: 767px) {
     .navbar-default .navbar-nav .open .dropdown-menu > li > a {
         color: #ecf0f1;