diff --git a/TODO b/TODO
index 5c272dc8..01fbefa5 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-CSS on stuff
Fix pooling for Rack
+Improve bumble - cache things, hasmany
Check times
diff --git a/app/views/blogs/blog.html.erb b/app/views/blogs/blog.html.erb
index 69e5dfb0..5ca1c373 100644
--- a/app/views/blogs/blog.html.erb
+++ b/app/views/blogs/blog.html.erb
@@ -1,12 +1,15 @@
<%=@blog.name%>
<% if @admin %>
- <%=link_to "New post", new_post_url(@blog) %>
+ <%=link_to "New post", new_post_url(@blog) %>
<% end %>
<% @posts.each do |p| %>
-<%=link_to p.title, post_url(@blog, p)%><%= @admin ? " - #{link_to("Remove post", remove_post_url(p), {:method => :post})}" : ""%>
+<%=link_to p.title, post_url(@blog, p)%>
+<% if @admin %>
+<%=link_to("Remove post", remove_post_url(p), {:method => :post})%>
+<% end %>
<%=p.content%>
diff --git a/app/views/blogs/start.html.erb b/app/views/blogs/start.html.erb
index 79be29c0..49f1047d 100644
--- a/app/views/blogs/start.html.erb
+++ b/app/views/blogs/start.html.erb
@@ -2,8 +2,11 @@
<% @posts.each do |p| %>
-<%=link_to p.title, post_url(p.blog, p)%><%= @admin ? " - #{link_to("Remove post", remove_post_url(p), {:method => :post})}" : ""%>
+<%=link_to p.title, post_url(p.blog, p)%>
In <%=link_to p.blog.name, blog_url(p.blog)%>
+<% if @admin %>
+<%=link_to("Remove post", remove_post_url(p), {:method => :post})%>
+<% end %>
<%=p.content%>
diff --git a/app/views/layouts/blog.html.erb b/app/views/layouts/blog.html.erb
index a32dc71c..9be3624f 100644
--- a/app/views/layouts/blog.html.erb
+++ b/app/views/layouts/blog.html.erb
@@ -1,30 +1,36 @@
Yet Another Ruby Blog
+
-
-
- |
- <% if @user %>
- Welcome <%=@person.sur_name%> | <%=link_to "Log out!", BeeU.logout(request)%>
- <% else %>
- <%=link_to "Log in!", BeeU.login(request)%>
- <% end -%>
- | <%= link_to "Blogs", blogs_url %>
- |
-
-
- |
-
- |
-
-
+
+
+
+
+ <%=yield%>
+
+
+
+