5 files changed, 33 insertions, 14 deletions
diff --git a/app/views/public_body/show.rhtml b/app/views/public_body/show.rhtml
index 5f20a9717..63bd5f7fc 100644
--- a/app/views/public_body/show.rhtml
+++ b/app/views/public_body/show.rhtml
@@ -4,7 +4,7 @@
       <h2><%= _('Follow this authority')%></h2>
 
       <% follower_count = TrackThing.count(:all, :conditions => ["public_body_id = ?", @public_body.id]) %>
-      <p><%= n_("There is %d person following this authority", "There are %d people following this authority", follower_count) % follower_count %></p>
+      <p><%= n_("<span id='follow_count'>%d</span> person is following this authority", "<span id='follow_count'>%d</span> people are following this authority", follower_count) % follower_count %></p>
 
         <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'sidebar' } %>
         <h2><%= _('More about this authority')%></h2>
diff --git a/app/views/request/_sidebar.rhtml b/app/views/request/_sidebar.rhtml
index fc65ce56a..5304ec312 100644
--- a/app/views/request/_sidebar.rhtml
+++ b/app/views/request/_sidebar.rhtml
@@ -3,8 +3,8 @@
     <h2><%= _('Follow this request') %></h2>
 
     <% follower_count = TrackThing.count(:all, :conditions => ["info_request_id = ?", @info_request.id]) + 1 %>
-    <p><%= n_("There is %d person following this request", "There are %d people following this request", follower_count) % follower_count %></p>
-     <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => @info_request.user == @user, :location => 'sidebar' } %>
+    <p class="follow_count"><%= n_("<span id='follow_count'>%d</span> person is following this request", "<span id='follow_count'>%d</span> people are following this request", follower_count) % follower_count %></p>
+     <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => @info_request.user == @user, :location => 'sidebar', :follower_count => follower_count } %>
   </div>
     <h2><%= _("Act on what you've learnt") %></h2>
 
diff --git a/app/views/track/_tracking_links.rhtml b/app/views/track/_tracking_links.rhtml
index ac1d302fc..18d4b372a 100644
--- a/app/views/track/_tracking_links.rhtml
+++ b/app/views/track/_tracking_links.rhtml
@@ -7,15 +7,17 @@
 <% if own_request %> 
     <p><%= _('This is your own request, so you will be automatically emailed when new responses arrive.')%></p>
 <% elsif existing_track %> 
-        <% form_tag({:controller => 'track', :action => 'update', :track_id => existing_track.id}, :class => "feed_form feed_form_" + location) do %>
-            <p>
-                <%= track_thing.params[:verb_on_page_already] %><br><br>
-		<%= link_to "Unsubscribe", {:controller => 'track', :action => 'update', :track_id => existing_track.id, :track_medium => "delete", :r => request.request_uri}, :class => "link_button_green" %>
-            </p>
-        <% end %>
+    <p><%= track_thing.params[:verb_on_page_already] %></p>
+    <div class="feed_link feed_link_<%=location%>">
+	<%= link_to "Unsubscribe", {:controller => 'track', :action => 'update', :track_id => existing_track.id, :track_medium => "delete", :r => request.request_uri}, :class => "link_button_green" %>
+    </div>
 <% elsif track_thing %>
     <div class="feed_link feed_link_<%=location%>">
+     <% if defined? follower_count && follower_count > 0 %>
+        <%= link_to _("I want to know, too"), do_track_url(track_thing), :class => "link_button_green" %>
+     <% else %>
         <%= link_to _("Follow"), do_track_url(track_thing), :class => "link_button_green" %>
+     <% end %>
     </div>
     
     <div class="feed_link feed_link_<%=location%>">
diff --git a/app/views/user/_change_receive_email.rhtml b/app/views/user/_change_receive_email.rhtml
index 6ed0bd144..78d847038 100644
--- a/app/views/user/_change_receive_email.rhtml
+++ b/app/views/user/_change_receive_email.rhtml
@@ -1,11 +1,11 @@
 <% form_tag(:controller=>"user", :action=>"set_receive_email_alerts") do %>
  <div>
  <% if @user.receive_email_alerts %>
-  <%= _('You are currently receiving notification of new activity on your wall by email.', :wall_url => show_user_wall_path) %>
+  <%= _('You are currently receiving notification of new activity on your wall by email.', :wall_url => show_user_wall_path) %><br><br>
   <%= hidden_field_tag 'receive_email_alerts', 'false' %>
   <%= submit_tag _("Turn off email alerts") %>
  <% else %>
-  <%= _('Items matching the following conditions are currently displayed on your wall.') %>
+  <%= _('Items matching the following conditions are currently displayed on your wall.') %><br><br>
   <%= hidden_field_tag 'receive_email_alerts', 'true' %>
   <%= submit_tag _("Also send me alerts by email") %>
  <% end %>
diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index 589bf6997..9e9e8ce28 100644
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -879,12 +879,29 @@ text-decoration:none;
 }
 
 #follow_box {
- background: #E9FDD3;
- border-radius: 6px;
- border: solid #B0CA86 1px;
+
  padding: 4px;
 }
 
+#follow_box .feed_link {
+ text-align: center;
+}
+
+#follow_count {
+ color: #93278F;
+ font-family: 'DeliciousBold', Arial, sans-serif;
+ font-weight: 700;
+ font-size: 60px;
+ line-height: 60px;
+ text-align: right;
+ float: left;
+ margin-top: -15px;
+ margin-right: 5px;
+}
+.follow_count {
+ clear:both;
+}
+
 #follow_box h2 {
  margin: 0;
 }