1 files changed, 34 insertions, 41 deletions
diff --git a/app/views/general/blog.rhtml b/app/views/general/blog.rhtml
index ad1530768..f5bd66ebd 100644
--- a/app/views/general/blog.rhtml
+++ b/app/views/general/blog.rhtml
@@ -1,53 +1,46 @@
 <% @title = "#{site_name} blog and tweets" %>
 
+<h1><%=@title %></h1>
+   <img src="/images/twitter.png" alt="twitter icon" valign="middle"> <a href="http://www.twitter.com/<%= MySociety::Config.get('TWITTER_USERNAME') %>">Follow us on twitter</a>&nbsp;
+   <img src="/images/rss.png" alt="RSS icon" valign="middle"> <a href="<%= MySociety::Config.get('BLOG_FEED') %>">Subscribe to blog</a>
 <% if !@twitter_user.empty? %>
-<div id="right_column">
-  <h2>Stay up to date</h2>
-  <div class="act_link">
-    <img src="/images/twitter-16.png" alt="twitter icon" valign="middle"> <a href="http://www.twitter.com/<%= MySociety::Config.get('TWITTER_USERNAME') %>">Follow us on twitter</a><br/>
-  </div>
-  <div class="act_link">
-    <img src="/images/feed-16.png" alt="RSS icon" valign="middle"> <a href="<%= MySociety::Config.get('BLOG_FEED') %>">Subscribe to blog</a>
-  </div>
-  <div id="twitter">
-  <script src="http://widgets.twimg.com/j/2/widget.js"></script>
-  <script>
-  new TWTR.Widget({
-    version: 2,
-    type: 'profile',
-    rpp: 15,
-    interval: 6000,
-    width: 'auto',
-    height: 500,
-    theme: {
-      shell: {
-        background: '#eaeaea',
-        color: '#000000'
-      },
-      tweets: {
-        background: '#ffffff',
-        color: '#000000',
-        links: '#0b004a'
-      }
+<div id="twitter">
+<script src="http://widgets.twimg.com/j/2/widget.js"></script>
+<script type="text/javascript">
+new TWTR.Widget({
+  version: 2,
+  type: 'profile',
+  rpp: 15,
+  interval: 6000,
+  width: 'auto',
+  height: 500,
+  theme: {
+    shell: {
+      background: '#eaeaea',
+      color: '#000000'
     },
-    features: {
-      scrollbar: false,
-      loop: false,
-      live: false,
-      hashtags: true,
-      timestamp: true,
-      avatars: true,
-      behavior: 'all'
+    tweets: {
+      background: '#ffffff',
+      color: '#000000',
+      links: '#0b004a'
     }
-  }).render().setUser('<%=@twitter_user %>').start();
-  </script>
+  },
+  features: {
+    scrollbar: false,
+    loop: false,
+    live: false,
+    hashtags: true,
+    timestamp: true,
+    avatars: true,
+    behavior: 'all'
+  }
+}).render().setUser('<%=@twitter_user %>').start();
+</script>
 
-  </div>
 </div>
 <% end %>
 
-<div id="left_column">
-   <h1><%=@title %></h1>
+<div id="blog">
   <% for item in @blog_items: %>
     <div class="blog_post">
         <h2><a href="<%=item['link']%>"><%=h item['title'] %></a></h2>