diff --git a/src/styles/_shots.sass b/src/styles/_shots.sass
index abeca89..a5f4e85 100644
--- a/src/styles/_shots.sass
+++ b/src/styles/_shots.sass
@@ -137,14 +137,20 @@
 	display: flex
 	flex-direction: column
 
-.item-details-empty
-	display: flex
-	align-items: center
-	justify-content: center
-	width: 100%
-	height: 100%
-	color: rgba($color-text-dark-hint, .5)
-	cursor: default
-	font:
-		size: 2em
-		weight: 100
+	.item-details-empty
+		display: flex
+		align-items: center
+		justify-content: center
+		width: 100%
+		height: 100%
+		color: rgba($color-text-dark-hint, .5)
+		cursor: default
+		font:
+			size: 2em
+			weight: 100
+
+#item-view-feed
+	padding: 10px
+	color: $color-text-dark-primary
+	pre
+		margin: 15px auto
diff --git a/src/templates/attract/shots/view_shot_embed.jade b/src/templates/attract/shots/view_shot_embed.jade
index 7f0580e..6a5916f 100644
--- a/src/templates/attract/shots/view_shot_embed.jade
+++ b/src/templates/attract/shots/view_shot_embed.jade
@@ -1,4 +1,4 @@
-.attract-form
+.attract-form.shot
 	form#shot_form(onsubmit="return shot_save('{{shot._id}}', '{{ url_for('attract.shots.perproject.save', project_url=project['url'], shot_id=shot._id) }}')")
 		input(type='hidden',name='_etag',value='{{ shot._etag }}')
 		.input-transparent-group
@@ -40,10 +40,11 @@
 			| {% if 'PUT' in shot.allowed_methods %}
 			button.btn.btn-default.btn-block(type=submit)
 				i.pi-check
-				|  Save Changes
+				|  Save Shot
 			| {% endif %}
-#task-view-feed
-	| Updated {{ shot._updated | pretty_date }}
+
+#item-view-feed
+	| Shot updated {{ shot._updated | pretty_date }}
 	pre.
 		{{ shot.to_dict() | pprint }}
 
diff --git a/src/templates/attract/tasks/view_task_embed.jade b/src/templates/attract/tasks/view_task_embed.jade
index a69921a..9454e9b 100644
--- a/src/templates/attract/tasks/view_task_embed.jade
+++ b/src/templates/attract/tasks/view_task_embed.jade
@@ -1,4 +1,5 @@
-.attract-form
+.attract-form.task(
+	class="status-{{ task.properties.status }}")
 	form#task_form(onsubmit="return task_save('{{task._id}}', '{{ url_for('attract.tasks.perproject.save', project_url=project['url'], task_id=task._id) }}')")
 		input(type='hidden',name='_etag',value='{{ task._etag }}')
 		.input-transparent-group
@@ -66,19 +67,21 @@
 				| <option value="{{ u._id }}" {% if u._id in task.properties.assigned_to['users'] %}selected{% endif %}>{{ u.full_name }}</option>
 				| {% endfor %}
 
+
+		| {% if 'PUT' in task.allowed_methods %}
+		.input-group-separator
+
 		.input-transparent-group
-			| {% if 'PUT' in task.allowed_methods %}
-			button.btn.btn-default(type='submit')
+			button.btn.btn-default.btn-block(type='submit')
 				i.pi-check
-				|  Save Changes
-			| {% endif %}
+				|  Save Task
+		| {% endif %}
 
 
-#task-view-feed
-	| Updated {{ task._updated | pretty_date }}
-	ul
-		each _, i in Array(5)
-			li=i
+#item-view-feed
+	| Task updated {{ task._updated | pretty_date }}
+	pre.
+		{{ task.to_dict() | pprint }}
 
 
 script.