diff --git a/src/styles/components/_jumbotron.sass b/src/styles/components/_jumbotron.sass
index ffa1a735..88dd15ac 100644
--- a/src/styles/components/_jumbotron.sass
+++ b/src/styles/components/_jumbotron.sass
@@ -23,3 +23,6 @@
 
 		h2, p
 			text-shadow: 1px 1px rgba(black, .2), 1px 1px 25px rgba(black, .5)
+
+	&:hover
+		text-decoration: none
diff --git a/src/templates/nodes/custom/blog/archive_main_project.pug b/src/templates/nodes/custom/blog/archive_main_project.pug
index 6ef9952a..bdbb6805 100644
--- a/src/templates/nodes/custom/blog/archive_main_project.pug
+++ b/src/templates/nodes/custom/blog/archive_main_project.pug
@@ -2,11 +2,8 @@
 | {% import 'nodes/custom/blog/_macros.html' as blogmacros %}
 
 | {% block body %}
-.container-fluid
-	#blog_container.cloud-blog
-		#blog_index-container
-			.blog_index-header
-				h3 Blog Archive
+.container
+	h3 Blog Archive
 
-			| {{ blogmacros.render_archive(project, posts, posts_meta) }}
+	| {{ blogmacros.render_archive(project, posts, posts_meta) }}
 | {% endblock body %}
diff --git a/src/templates/nodes/custom/blog/index.pug b/src/templates/nodes/custom/blog/index.pug
index 6d502a1b..d5381689 100644
--- a/src/templates/nodes/custom/blog/index.pug
+++ b/src/templates/nodes/custom/blog/index.pug
@@ -9,9 +9,7 @@ link(href="{{ url_for('static_pillar', filename='assets/css/blog.css') }}", rel=
 | {% endblock %}
 
 | {% block project_context %}
-#blog_container
-	#blog_index-container.expand-image-links
-		| {{ blogmacros.render_blog_index(project, posts, can_create_blog_posts, api, more_posts_available, posts_meta) }}
+| {{ blogmacros.render_blog_index(project, posts, can_create_blog_posts, api, more_posts_available, posts_meta) }}
 | {% endblock %}
 
 | {% block project_tree %}
diff --git a/src/templates/nodes/custom/blog/index_main_project.pug b/src/templates/nodes/custom/blog/index_main_project.pug
index 64b239fc..6f809bff 100644
--- a/src/templates/nodes/custom/blog/index_main_project.pug
+++ b/src/templates/nodes/custom/blog/index_main_project.pug
@@ -10,10 +10,7 @@ link(href="{{ url_for('static_cloud', filename='assets/css/project-landing.css')
 | {% endblock css %}
 
 | {% block body %}
-.container-fluid.blog
-	#blog_container.cloud-blog
-		#blog_index-container.expand-image-links
-			| {{ blogmacros.render_blog_index(project, posts, can_create_blog_posts, api, more_posts_available, posts_meta, pages=pages) }}
+| {{ blogmacros.render_blog_index(project, posts, can_create_blog_posts, api, more_posts_available, posts_meta, pages=pages) }}
 | {% endblock %}
 
 | {% block footer_scripts %}
@@ -25,7 +22,7 @@ script.
 	/* Expand images when their link points to a jpg/png/gif */
 	/* TODO: De-duplicate code from view post */
 	var page_overlay = document.getElementById('page-overlay');
-	$('.blog_index-item .item-content a img').on('click', function(e){
+	$('.item-content a img').on('click', function(e){
 		e.preventDefault();
 
 		var href = $(this).parent().attr('href');
diff --git a/src/templates/nodes/custom/post/create.pug b/src/templates/nodes/custom/post/create.pug
index 10414e29..6af4c7a1 100644
--- a/src/templates/nodes/custom/post/create.pug
+++ b/src/templates/nodes/custom/post/create.pug
@@ -68,7 +68,7 @@
 						| {% endif %}
 						| {% endfor %}
 
-					input.btn.btn-outline-secondary.button-create(type='submit', value='Create {{ node_type.name }}')
+					input.btn.btn-outline-secondary(type='submit', value='Create {{ node_type.name }}')
 
 					a.btn.btn-link.button-back(href="{{ url_for('projects.view', project_url=project.url) }}blog")
 						| Back to Blog
diff --git a/src/templates/nodes/custom/post/view_embed.pug b/src/templates/nodes/custom/post/view_embed.pug
index 4924162e..d5e1e38f 100644
--- a/src/templates/nodes/custom/post/view_embed.pug
+++ b/src/templates/nodes/custom/post/view_embed.pug
@@ -1,19 +1,9 @@
 | {% import 'nodes/custom/blog/_macros.html' as blogmacros %}
 
-#blog_container(class="{% if project and project._id == config.MAIN_PROJECT_ID %}cloud-blog{% endif %}")
+| {{ blogmacros.render_blog_post(node, project=project) }}
 
-	#blog_index-container.expand-image-links
-		.blog-action
-			| {% if node.has_method('PUT') %}
-			a.btn.btn-outline-secondary.button-edit(href="{{url_for('nodes.edit', node_id=node._id)}}")
-				i.pi-edit
-				| Edit Post
-			| {% endif %}
-
-		| {{ blogmacros.render_blog_post(node, project=project) }}
-
-		#comments-embed
-			.comments-list-loading
-				i.pi-spin
+#comments-embed.comments-compact
+	.comments-list-loading
+		i.pi-spin
 
 include ../_scripts
diff --git a/src/templates/nodes/custom/post/view_main_project.pug b/src/templates/nodes/custom/post/view_main_project.pug
index c8c48071..26ece6ec 100644
--- a/src/templates/nodes/custom/post/view_main_project.pug
+++ b/src/templates/nodes/custom/post/view_main_project.pug
@@ -26,8 +26,7 @@ link(href="{{ url_for('static_cloud', filename='assets/css/project-landing.css')
 | {% set title = 'blog' %}
 
 | {% block body %}
-.container-fluid.blog
-	| {% include 'nodes/custom/post/view_embed.html' %}
+| {% include 'nodes/custom/post/view_embed.html' %}
 | {% endblock %}