diff --git a/app/views/checkout/edit.html.haml b/app/views/checkout/edit.html.haml
index f5e70172c2..c2cc0aaa9d 100644
--- a/app/views/checkout/edit.html.haml
+++ b/app/views/checkout/edit.html.haml
@@ -1,3 +1,6 @@
+- content_for(:title) do
+  Checkout
+
 = inject_enterprises
 
 .darkswarm.footer-pad
@@ -23,4 +26,3 @@
 
 
 = render partial: "shared/footer"
-
diff --git a/app/views/enterprises/shop.html.haml b/app/views/enterprises/shop.html.haml
index 08e25417cb..3af68f4a50 100644
--- a/app/views/enterprises/shop.html.haml
+++ b/app/views/enterprises/shop.html.haml
@@ -1,3 +1,6 @@
+- content_for(:title) do
+  = current_distributor.name
+
 = inject_enterprises
 
 %shop.darkswarm
diff --git a/app/views/groups/index.html.haml b/app/views/groups/index.html.haml
index 332ba095fb..537a81cc26 100644
--- a/app/views/groups/index.html.haml
+++ b/app/views/groups/index.html.haml
@@ -1,4 +1,7 @@
-= inject_enterprises 
+- content_for(:title) do
+  Groups
+
+= inject_enterprises
 
 :javascript
   angular.module('Darkswarm').value('groups', #{render partial: "json/groups", object: @groups})
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index 747999fec8..907926f8b7 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -1,3 +1,6 @@
+- content_for(:title) do
+  = @group.name
+
 -# inject all enterprises as "enterprises"
 -# it could be more efficient to inject only the enterprises that are related to the group
 = inject_enterprises
diff --git a/app/views/groups/signup.html.haml b/app/views/groups/signup.html.haml
index c33b70b1bb..db12442d23 100644
--- a/app/views/groups/signup.html.haml
+++ b/app/views/groups/signup.html.haml
@@ -1,3 +1,6 @@
+- content_for(:title) do
+  Sign up as a group
+
 #panes
   #shops-signup.pane
     .row.header
diff --git a/app/views/layouts/darkswarm.html.haml b/app/views/layouts/darkswarm.html.haml
index 555a703d2f..a4d8db30c0 100644
--- a/app/views/layouts/darkswarm.html.haml
+++ b/app/views/layouts/darkswarm.html.haml
@@ -3,7 +3,7 @@
     %meta{charset: 'utf-8'}/
     %meta{name: 'viewport', content: "width=device-width,initial-scale=1.0"}/
 
-    %title= content_for?(:title) ? yield(:title) : 'Welcome to Open Food Network'
+    %title= content_for?(:title) ? "#{yield(:title)} - Open Food Network" : 'Welcome to Open Food Network'
     - if Rails.env.production?
       = favicon_link_tag
     - else
diff --git a/app/views/layouts/registration.html.haml b/app/views/layouts/registration.html.haml
index c0f87724f2..c0e0c4b7ec 100644
--- a/app/views/layouts/registration.html.haml
+++ b/app/views/layouts/registration.html.haml
@@ -3,7 +3,7 @@
     %meta{charset: 'utf-8'}/
     %meta{name: 'viewport', content: "width=device-width,initial-scale=1.0"}/
 
-    %title= content_for?(:title) ? yield(:title) : 'Welcome to Open Food Network'
+    %title= content_for?(:title) ? "#{yield(:title)} - Open Food Network" : 'Welcome to Open Food Network'
     - if Rails.env.production?
       = favicon_link_tag
     - else
diff --git a/app/views/map/index.html.haml b/app/views/map/index.html.haml
index ce4052be57..30df47e28c 100644
--- a/app/views/map/index.html.haml
+++ b/app/views/map/index.html.haml
@@ -1,8 +1,11 @@
-= inject_enterprises 
+- content_for(:title) do
+  Map
+
+= inject_enterprises
 
 .map-container{"fill-vertical" => true}
   %map{"ng-controller" => "MapCtrl"}
     %google-map{options: "map.additional_options", center: "map.center", zoom: "map.zoom", styles: "map.styles", draggable: "true"}
       %map-search
-      %markers{models: "OfnMap.enterprises", fit: "true", 
-      coords: "'self'", icon: "'icon'", click: "'reveal'"} 
+      %markers{models: "OfnMap.enterprises", fit: "true",
+      coords: "'self'", icon: "'icon'", click: "'reveal'"}
diff --git a/app/views/producers/index.html.haml b/app/views/producers/index.html.haml
index 2ac53f54c4..3dbbfe9fbb 100644
--- a/app/views/producers/index.html.haml
+++ b/app/views/producers/index.html.haml
@@ -1,3 +1,6 @@
+- content_for(:title) do
+  Producers
+
 = inject_enterprises
 
 .producers{"ng-controller" => "EnterprisesCtrl", "ng-cloak" => true}
diff --git a/app/views/producers/signup.html.haml b/app/views/producers/signup.html.haml
index fcaff14425..6f2cee2a5b 100644
--- a/app/views/producers/signup.html.haml
+++ b/app/views/producers/signup.html.haml
@@ -1,3 +1,6 @@
+- content_for(:title) do
+  Sign up as a producer
+
 #panes
   #producer-signup.pane
     .row.header
diff --git a/app/views/registration/index.html.haml b/app/views/registration/index.html.haml
index d110e98657..a05c383395 100644
--- a/app/views/registration/index.html.haml
+++ b/app/views/registration/index.html.haml
@@ -1,3 +1,6 @@
+- content_for(:title) do
+  Register
+
 = inject_spree_api_key
 = inject_available_countries
 = inject_enterprise_attributes
diff --git a/app/views/shops/index.html.haml b/app/views/shops/index.html.haml
index e0fe3c83bb..40a42da1ea 100644
--- a/app/views/shops/index.html.haml
+++ b/app/views/shops/index.html.haml
@@ -1,3 +1,6 @@
+- content_for(:title) do
+  Shops
+
 #panes
   #shops.pane
     .row
diff --git a/app/views/shops/signup.html.haml b/app/views/shops/signup.html.haml
index 0337f06c39..72c319413f 100644
--- a/app/views/shops/signup.html.haml
+++ b/app/views/shops/signup.html.haml
@@ -1,3 +1,6 @@
+- content_for(:title) do
+  Sign up as a hub
+
 #panes
   #shops-signup.pane
     .row.header
diff --git a/app/views/spree/orders/edit.html.haml b/app/views/spree/orders/edit.html.haml
index adb6ef303a..3a00558a52 100644
--- a/app/views/spree/orders/edit.html.haml
+++ b/app/views/spree/orders/edit.html.haml
@@ -1,18 +1,21 @@
-= inject_enterprises 
+- content_for(:title) do
+  Shopping Cart
+
+= inject_enterprises
 
 .darkswarm
   - content_for :order_cycle_form do
     %closing Your shopping cart
-    %p 
+    %p
       Order ready for
       %strong
         - if @order.order_cycle
-          = pickup_time @order.order_cycle 
+          = pickup_time @order.order_cycle
         - else
           = @order.distributor.next_collection_at
 
   = render partial: "shopping_shared/details"
-  
+
   %fieldset.footer-pad
     - if @order.line_items.empty?
       %div.row{"data-hook" => "empty_cart"}
@@ -31,9 +34,9 @@
         .links{'data-hook' => "cart_buttons"}
           .row
             .columns.large-8{"data-hook" => ""}
-              
+
               %a.button.large.secondary{href: main_app.shop_path}
-                %i.ofn-i_008-caret-left 
+                %i.ofn-i_008-caret-left
                 Continue shopping
             .columns.large-4.text-right
               %a#checkout-link.button.large.primary{href: main_app.checkout_path}
@@ -41,4 +44,3 @@
                 %i.ofn-i_007-caret-right
 
 = render partial: "shared/footer"
-
diff --git a/app/views/spree/orders/show.html.haml b/app/views/spree/orders/show.html.haml
index ee0d080514..7533ae981a 100644
--- a/app/views/spree/orders/show.html.haml
+++ b/app/views/spree/orders/show.html.haml
@@ -1,3 +1,6 @@
+- content_for(:title) do
+  Order Confirmation
+
 = inject_enterprises
 
 .darkswarm
@@ -32,4 +35,4 @@
               = link_to t(:my_account), spree_account_path, :class => "button"
 
 
-= render partial: "shared/footer"
\ No newline at end of file
+= render partial: "shared/footer"