diff --git a/app/views/shared/_footer.html.haml b/app/views/shared/_footer.html.haml
index 216fe436..1e9f5334 100644
--- a/app/views/shared/_footer.html.haml
+++ b/app/views/shared/_footer.html.haml
@@ -1,37 +1,35 @@
%footer#footer
.inside-footer.cf
#tweetbtn
- :erb
-
-
+ %iframe#twitter-widget-0.twitter-follow-button.twitter-follow-button{:allowtransparency => "true", "data-twttr-rendered" => "true", :frameborder => "0", :scrolling => "no", :src => "https://platform.twitter.com/widgets/follow_button.7c0d5c8fc0456a01b74fed2e38018608.en.html#_=1429265464280&dnt=false&id=twitter-widget-0&lang=en&screen_name=coderwall&show_count=false&show_screen_name=true&size=m", :style => "height: 20px;", :title => "Twitter Follow Button"}
+ %script{:src => "https://platform.twitter.com/widgets.js", :type => "text/javascript"}
%nav#footer-nav
%ul.footer-links.cf
- %li= link_to('Contact', contact_us_path)
- %li= link_to('API & Hacks', api_path)
- %li= link_to('FAQ', faq_path)
- %li= link_to('Privacy Policy', privacy_policy_path)
- %li= link_to('Terms of Service', tos_path)
- %li= link_to('Jobs', '/jobs')
- %li.employers= link_to('Employers', employers_path)
- =yield :footer_menu
-
- %ul.assembly-badge
- %li
- %a{:href => "https://assembly.com/coderwall?utm_campaign=assemblage&utm_source=coderwall&utm_medium=flair_widget&utm_content=flag_with_text"}
- %img{:height => "41px", :src => "https://treasure.assembly.com/assets/badges/flag_text-6cfc91728f9f0090d1688e4f0d41a639.svg", :width => "24px"}
- Assembly
- %ul.copyright
- %li Copyright © 2015 Assembly Made, Inc. All rights reserved.
+ %li
+ %a{:href => "/contact_us"} Contact
+ %li
+ %a{:href => "/api"} API & Hacks
+ %li
+ %a{:href => "/faq"} FAQ
+ %li
+ %a{:href => "/privacy_policy"} Privacy Policy
+ %li
+ %a{:href => "/tos"} Terms of Service
+ %li
+ %a{:href => "/jobs"} Jobs
+ %li.employers
+ %a{:href => "/employers"} Employers
+ %li
+ %a{:href => "/p/t/by_tags"} Protips
+ %ul.assembly-badge{:style => "display:inline;float:left;"}
+ %li
+ %a{:href => "https://assembly.com/coderwall?utm_campaign=assemblage&utm_source=coderwall&utm_medium=flair_widget&utm_content=flag_with_text"}
+ %img{:height => "41px", :src => "https://treasure.assembly.com/assets/badges/flag_text-6cfc91728f9f0090d1688e4f0d41a639.svg"}/
+ %ul.copyright{:style => "float:left; margin-left:15%;"}
+ %li Copyright © 2015 Assembly Made, Inc. All rights reserved.
%ul.credits
- %li= yield :credits
- %ul.mixpanel
- %li
- :erb
-
-= javascript_include_tag 'application'
-= render partial: 'shared/mixpanel_properties'
-= yield :javascript
-:erb
-
+ %li
+ %ul.mixpanel{:style => "float:right; margin-top:-10px"}
+ %li
+ %a{:href => "https://mixpanel.com/f/partner"}
+ %img{:alt => "Real Time Web Analytics", :src => "https://mixpanel.com/site_media/images/partner/badge_light.png"}/