diff --git a/app/views/groups/_meeting_info.haml b/app/views/groups/_meeting_info.haml
new file mode 100644
index 00000000..5b878379
--- /dev/null
+++ b/app/views/groups/_meeting_info.haml
@@ -0,0 +1,17 @@
+%p
+  %strong 🗓️ When
+  - if group.time?
+    = group.time
+  - else
+    %span.info-not-given
+      not specified
+%p
+  %strong 🏢 Meeting place
+  - if group.address?
+    = group.address
+  - else
+    %span.info-not-given
+      not specified
+%p
+  %strong 🗺️ Address
+  = group_location(group)
diff --git a/app/views/groups/_one_group.html.haml b/app/views/groups/_one_group.html.haml
index 2006185c..d8a418e5 100644
--- a/app/views/groups/_one_group.html.haml
+++ b/app/views/groups/_one_group.html.haml
@@ -23,20 +23,5 @@
       - if group.searching_location
         %span.tag
           Searching for location
-    %p
-      %strong When:
-      - if group.time?
-        = group.time
-      - else
-        %span.info-not-given
-          not specified
-    %p
-      %strong Where:
-      - if group.address?
-        = group.address
-      - else
-        %span.info-not-given
-          not specified
-    %p
-      %strong Address:
-      = group_location(group)
+
+    = render 'meeting_info', group: group
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index b5e5874f..3d713b74 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -13,23 +13,8 @@
       - else
         = image_tag('/group-avatar.png', size: "100x100")
       .profile-contact-sub
-        %p
-          %strong 🗓️ When
-          - if @group.time?
-            = @group.time
-          - else
-            %span.info-not-given
-              not specified
-        %p
-          %strong 🏢 Meeting place
-          - if @group.address?
-            = @group.address
-          - else
-            %span.info-not-given
-              not specified
-        %p
-          %strong 🗺️ Address
-          = group_location(@group)
+        = render 'meeting_info', group: @group
+
         - if @group.contact?
           %p
             %strong 📮 Contact
diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml
index 453a66a0..e9cf59b0 100644
--- a/app/views/people/show.html.haml
+++ b/app/views/people/show.html.haml
@@ -34,7 +34,7 @@
             = render partial: "shared/website", locals: { object: @person }
 
     .profile-working-on
-      .m-b-l
+      .m-b-l.working-on
         - if @person.working_on?
           %h2 Working on
           %p= markdown(@person.working_on)
diff --git a/spec/features/workshop_coach_spec.rb b/spec/features/workshop_coach_spec.rb
index 6def4e3d..e655a1c3 100644
--- a/spec/features/workshop_coach_spec.rb
+++ b/spec/features/workshop_coach_spec.rb
@@ -1,4 +1,3 @@
-
 require 'spec_helper'
 
 feature 'workshop coach' do
@@ -18,7 +17,7 @@ def login_as_user
   end
 
   def coach_text
-    'I am willing to coach at Rails Girls workshops'
+    'I am willing to coach at'
   end
 
   def see_workshop_coach_text