diff --git a/app/views/answer/show.html.haml b/app/views/answer/show.html.haml
index 9490e15b..301e8629 100644
--- a/app/views/answer/show.html.haml
+++ b/app/views/answer/show.html.haml
@@ -1,3 +1,3 @@
+- provide(:title, "#{@answer.user.display_name.blank? ? "@#{@answer.user.screen_name}'s" : "#{@answer.user.display_name}'s"} answer | #{APP_CONFIG['site_name']}")
 .container.j2-page
   = render 'shared/answerbox', a: @answer
-
diff --git a/app/views/devise/confirmations/new.html.haml b/app/views/devise/confirmations/new.html.haml
index 59a3b121..f71e2208 100644
--- a/app/views/devise/confirmations/new.html.haml
+++ b/app/views/devise/confirmations/new.html.haml
@@ -1,3 +1,4 @@
+- provide(:title, "Resend confirmation instructions | #{APP_CONFIG['site_name']}")
 .container
   %h1 Resend confirmation instructions
   = bootstrap_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
diff --git a/app/views/devise/passwords/edit.html.haml b/app/views/devise/passwords/edit.html.haml
index a6f67a09..8ac67b9a 100644
--- a/app/views/devise/passwords/edit.html.haml
+++ b/app/views/devise/passwords/edit.html.haml
@@ -1,3 +1,4 @@
+- provide(:title, "Change your password | #{APP_CONFIG['site_name']}")
 .container
   %h1 Change your password
   = bootstrap_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
diff --git a/app/views/devise/passwords/new.html.haml b/app/views/devise/passwords/new.html.haml
index 59aabb17..5db5f61d 100644
--- a/app/views/devise/passwords/new.html.haml
+++ b/app/views/devise/passwords/new.html.haml
@@ -1,3 +1,4 @@
+- provide(:title, "Forgot your password? | #{APP_CONFIG['site_name']}")
 .container
   %h1 Forgot your password?
   = bootstrap_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml
index 81cc63df..a5c8dc45 100644
--- a/app/views/devise/registrations/new.html.haml
+++ b/app/views/devise/registrations/new.html.haml
@@ -1,3 +1,4 @@
+- provide(:title, "Sign up | #{APP_CONFIG['site_name']}")
 .container
   %h1 Sign up
 
diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml
index f9cfb033..26f5893d 100644
--- a/app/views/devise/sessions/new.html.haml
+++ b/app/views/devise/sessions/new.html.haml
@@ -1,3 +1,4 @@
+- provide(:title, "Sign in | #{APP_CONFIG['site_name']}")
 .container
   %h1 Sign in
   = render 'layouts/messages'
@@ -9,7 +10,7 @@
 
     - if devise_mapping.rememberable?
       = f.check_box :remember_me
-    
+
     = f.submit "Sign in"
 
   = render "devise/shared/links"
diff --git a/app/views/devise/unlocks/new.html.haml b/app/views/devise/unlocks/new.html.haml
index 32283326..e718da96 100644
--- a/app/views/devise/unlocks/new.html.haml
+++ b/app/views/devise/unlocks/new.html.haml
@@ -1,13 +1,14 @@
+- provide(:title, "Unlock | #{APP_CONFIG['site_name']}")
 .container
   %h1 Resend unlock instructions
   = render 'layouts/messages'
 
   = bootstrap_form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f|
     = devise_error_messages!
-    
+
     = f.email_field :email, autofocus: true, label: "Email address"
-    
+
     = f.submit "Resend unlock instructions"
-    
+
   = render "devise/shared/links"
 = render "shared/links"
diff --git a/app/views/group/index.html.haml b/app/views/group/index.html.haml
index bb0a7648..e95f8c98 100644
--- a/app/views/group/index.html.haml
+++ b/app/views/group/index.html.haml
@@ -1,3 +1,4 @@
+- provide(:title, "#{@group.display_name} | #{APP_CONFIG['site_name']}")
 = render 'static/mobile_nav'
 .container.j2-page
   .col-md-3.col-sm-3
diff --git a/app/views/inbox/show.html.haml b/app/views/inbox/show.html.haml
index ced60bd5..f5acd1b9 100644
--- a/app/views/inbox/show.html.haml
+++ b/app/views/inbox/show.html.haml
@@ -1,3 +1,4 @@
+- provide(:title, "Inbox | #{APP_CONFIG['site_name']}")
 .container.j2-page
   .row
     .col-md-3.col-xs-12.col-sm-3.hidden-xs
@@ -21,4 +22,4 @@
       = render 'inbox/sidebar'
 
 = render "shared/links"
-- @inbox.update_all(new: false)
\ No newline at end of file
+- @inbox.update_all(new: false)
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 8fd481eb..291159f8 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -12,7 +12,7 @@
     %link{rel: 'icon', href: '/images/favicon/favicon-16.png', sizes: '16x16'}
     %link{rel: 'icon', href: '/icon-152.png', sizes: '152x152'}
     %link{rel: 'icon', href: '/images/favicon/favicon-32.png', sizes: '32x32'}
-    %title= APP_CONFIG['site_name']
+    %title= yield(:title)
     = stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true
     = javascript_include_tag 'application', 'data-turbolinks-track' => true
     - if user_signed_in?
diff --git a/app/views/moderation/index.html.haml b/app/views/moderation/index.html.haml
index 8a5c3e34..672983b3 100644
--- a/app/views/moderation/index.html.haml
+++ b/app/views/moderation/index.html.haml
@@ -1,3 +1,4 @@
+- provide(:title, "Moderation | #{APP_CONFIG['site_name']}")
 = render 'moderation/moderation_nav'
 .container.j2-page
   .row
diff --git a/app/views/notifications/index.html.haml b/app/views/notifications/index.html.haml
index 4b12b4b4..b3d3055c 100644
--- a/app/views/notifications/index.html.haml
+++ b/app/views/notifications/index.html.haml
@@ -1,3 +1,4 @@
+- provide(:title, "Notifications | #{APP_CONFIG['site_name']}")
 = render 'notifications/notification_nav'
 .container.j2-page
   = render 'notification_tabs'
@@ -12,4 +13,4 @@
     - if @notifications.next_page
       %button#load-more-btn.btn.btn-default{type: :button, data: { current_page: @notifications.current_page }}
         Load more
-- Notification.for(current_user).update_all(new: false)
\ No newline at end of file
+- Notification.for(current_user).update_all(new: false)
diff --git a/app/views/public/index.html.haml b/app/views/public/index.html.haml
index 070fff40..59a86c9d 100644
--- a/app/views/public/index.html.haml
+++ b/app/views/public/index.html.haml
@@ -1,3 +1,4 @@
+- provide(:title, "Public Timeline | #{APP_CONFIG['site_name']}")
 = render 'static/mobile_nav'
 .container.j2-page
   .col-md-3.col-sm-3
diff --git a/app/views/question/show.html.haml b/app/views/question/show.html.haml
index 3f4eb9bb..67ad0eb3 100644
--- a/app/views/question/show.html.haml
+++ b/app/views/question/show.html.haml
@@ -1,3 +1,4 @@
+- provide(:title, "#{@question.user.display_name.blank? ? "@#{@question.user.screen_name}'s" : "#{@question.user.display_name}'s"} question | #{APP_CONFIG['site_name']}")
 .panel.panel-question
   .container
     .panel-body
diff --git a/app/views/services/index.html.haml b/app/views/services/index.html.haml
index 2ab23b45..fe04011b 100644
--- a/app/views/services/index.html.haml
+++ b/app/views/services/index.html.haml
@@ -1,3 +1,4 @@
+- provide(:title, "Service Settings | #{APP_CONFIG['site_name']}")
 .container.j2-page
   = render 'user/settings_tabs'
   .col-md-9.col-xs-12.col-sm-9
@@ -20,4 +21,4 @@
               %i{class: "fa fa-#{service.provider}"}
               %strong= service.provider.capitalize
               (#{service.nickname})
-              = link_to 'Disconnect', service_path(service), data: { confirm: "Really disconnect service #{service.provider.capitalize}?" }, method: :delete
\ No newline at end of file
+              = link_to 'Disconnect', service_path(service), data: { confirm: "Really disconnect service #{service.provider.capitalize}?" }, method: :delete
diff --git a/app/views/static/_front.html.haml b/app/views/static/_front.html.haml
index a80de480..bcd140d4 100644
--- a/app/views/static/_front.html.haml
+++ b/app/views/static/_front.html.haml
@@ -29,4 +29,4 @@
         Sharing to other networks
       %p
         Want to share your answer to a question so that more people read it?  With a simple click on the answer button, your answer is shared wherever you want!
-= render "shared/links"
\ No newline at end of file
+= render "shared/links"
diff --git a/app/views/static/about.html.haml b/app/views/static/about.html.haml
index 37728e7e..03d6a77f 100644
--- a/app/views/static/about.html.haml
+++ b/app/views/static/about.html.haml
@@ -1,3 +1,4 @@
+- provide(:title, "About | #{APP_CONFIG['site_name']}")
 .jumbotron.j2-jumbo.text-center
   %h1= APP_CONFIG['site_name']
   %p About our service, features and other information
diff --git a/app/views/static/faq.html.haml b/app/views/static/faq.html.haml
index 554a4e5f..2915de26 100644
--- a/app/views/static/faq.html.haml
+++ b/app/views/static/faq.html.haml
@@ -1,3 +1,4 @@
+- provide(:title, "Frequently Asked Questions | #{APP_CONFIG['site_name']}")
 .container
   %h1.text-center Frequently Asked Questions
 
@@ -122,7 +123,5 @@
           Yep!  #{APP_CONFIG['site_name']} runs
           = succeed ',' do
             %a{href: 'https://github.com/nilsding/justask'} justask
-          an open source (AGPLv3) question and answer platform. If you want to contribute or report bugs you find in  #{APP_CONFIG['site_name']}, please look at our 
+          an open source (AGPLv3) question and answer platform. If you want to contribute or report bugs you find in  #{APP_CONFIG['site_name']}, please look at our
           = link_to "Github repository!", "https://github.com/retrospring/retrospring"
-
-
diff --git a/app/views/static/index.html.haml b/app/views/static/index.html.haml
index 3f76c635..f5276849 100644
--- a/app/views/static/index.html.haml
+++ b/app/views/static/index.html.haml
@@ -1,3 +1,4 @@
+- provide(:title, "#{APP_CONFIG['site_name']}")
 - if user_signed_in?
   = render 'static/mobile_nav'
   .container.j2-page
diff --git a/app/views/static/privacy_policy.html.haml b/app/views/static/privacy_policy.html.haml
index 81bd95c7..7ea7c7c5 100644
--- a/app/views/static/privacy_policy.html.haml
+++ b/app/views/static/privacy_policy.html.haml
@@ -1,3 +1,4 @@
+- provide(:title, "Privacy Policy | #{APP_CONFIG['site_name']}")
 .container
   .panel.panel-default
     .panel-body
@@ -24,4 +25,4 @@
       %h2 Our Policy Towards Children
       %p Our Services are not directed to persons under 14. If you become aware that your child has provided us with personal information without your consent, contact us on privacy@retrospring.net . We do not knowingly collect personal information from children under 14. If we become aware that a child under 14 has provided us with personal information, we take steps to remove such information and terminate the child's account.
       %p
-        %em Effective: 16th February 2015
\ No newline at end of file
+        %em Effective: 16th February 2015
diff --git a/app/views/static/terms.html.haml b/app/views/static/terms.html.haml
index 70b97aaa..f918cab0 100644
--- a/app/views/static/terms.html.haml
+++ b/app/views/static/terms.html.haml
@@ -1,3 +1,4 @@
+- provide(:title, "Terms of Service | #{APP_CONFIG['site_name']}")
 .container
   .panel.panel-default
     .panel-body
diff --git a/app/views/user/_account.html.haml b/app/views/user/_account.html.haml
index be98fc87..0c9eda99 100644
--- a/app/views/user/_account.html.haml
+++ b/app/views/user/_account.html.haml
@@ -1,3 +1,4 @@
+- provide(:title, "Account Settings | #{APP_CONFIG['site_name']}")
 .container.j2-page
   = render 'user/settings_tabs'
   .col-md-9.col-xs-12.col-sm-9
@@ -42,4 +43,4 @@
 
         = link_to "Back", :back
 
-.visible-xs= render "shared/links"
\ No newline at end of file
+.visible-xs= render "shared/links"
diff --git a/app/views/user/edit.html.haml b/app/views/user/edit.html.haml
index 66e537cb..9a646467 100644
--- a/app/views/user/edit.html.haml
+++ b/app/views/user/edit.html.haml
@@ -1,3 +1,4 @@
+- provide(:title, "Profile Settings | #{APP_CONFIG['site_name']}")
 .container.j2-page
   = render 'settings_tabs'
   .col-md-9.col-xs-12.col-sm-9
diff --git a/app/views/user/edit_privacy.html.haml b/app/views/user/edit_privacy.html.haml
index eb151105..b705cb12 100644
--- a/app/views/user/edit_privacy.html.haml
+++ b/app/views/user/edit_privacy.html.haml
@@ -1,3 +1,4 @@
+- provide(:title, "Privacy Settings | #{APP_CONFIG['site_name']}")
 .container.j2-page
   = render 'settings_tabs'
   .col-md-9.col-xs-12.col-sm-9
@@ -10,4 +11,4 @@
           = f.check_box :privacy_allow_public_timeline, label: "Show your answers in the public timeline"
           = f.check_box :privacy_allow_stranger_answers, label: "Allow other people to answer your questions"
 
-          = f.submit "Save settings", class: 'btn btn-primary'
\ No newline at end of file
+          = f.submit "Save settings", class: 'btn btn-primary'
diff --git a/app/views/user/questions.html.haml b/app/views/user/questions.html.haml
index f5e4262e..884e88b3 100644
--- a/app/views/user/questions.html.haml
+++ b/app/views/user/questions.html.haml
@@ -1,3 +1,4 @@
+- provide(:title, "#{@user.display_name.blank? ? "@#{@user.screen_name}'s" : "#{@user.display_name}'s"} questions | #{APP_CONFIG['site_name']}")
 .profile--header
 .container.j2-page
   .col-md-3.col-xs-12.col-sm-4.j2-col-reset
diff --git a/app/views/user/show.html.haml b/app/views/user/show.html.haml
index ab34fcdc..47e32e9d 100644
--- a/app/views/user/show.html.haml
+++ b/app/views/user/show.html.haml
@@ -1,3 +1,4 @@
+- provide(:title, "#{@user.display_name.blank? ? "@#{@user.screen_name}" : "#{@user.display_name} (@#{@user.screen_name})"} | #{APP_CONFIG['site_name']}")
 - no_header = unless @user.profile_header.exists? then "profile--no-header" else "" end
 #profile--header.hidden-xs{class: no_header}
   %img.profile--header-img{src: @user.profile_header.url(:web)}
diff --git a/app/views/user/show_follow.html.haml b/app/views/user/show_follow.html.haml
index 83f526da..f1af7740 100644
--- a/app/views/user/show_follow.html.haml
+++ b/app/views/user/show_follow.html.haml
@@ -1,3 +1,4 @@
+- provide(:title, "#{@user.display_name.blank? ? "@#{@user.screen_name}'s" : "#{@user.display_name}'s"} friends & followers | #{APP_CONFIG['site_name']}")
 .profile--header
 .container.j2-page
   .col-md-3.col-xs-12.col-sm-4.j2-col-reset
@@ -18,4 +19,4 @@
         Load more
   .visible-xs= render 'shared/links'
 - if user_signed_in?
-  = render 'user/modal_group_memberships'
\ No newline at end of file
+  = render 'user/modal_group_memberships'