diff --git a/src/scripts/tutti/10_tasks.js b/src/scripts/tutti/10_tasks.js
index 00bafdc..16a41d0 100644
--- a/src/scripts/tutti/10_tasks.js
+++ b/src/scripts/tutti/10_tasks.js
@@ -122,7 +122,7 @@ function asset_open(asset_id)
 window.onpopstate = function(event)
 {
     var state = event.state;
-
+    if(!state) return;
     item_open(state.itemId, state.itemType, false);
 }
 
diff --git a/src/templates/attract/assets/view_asset_embed.pug b/src/templates/attract/assets/view_asset_embed.pug
index 8129e12..649ad46 100644
--- a/src/templates/attract/assets/view_asset_embed.pug
+++ b/src/templates/attract/assets/view_asset_embed.pug
@@ -72,7 +72,7 @@
 
 #item-view-feed
 	#activities
-	#comments-embed
+	| <comments-tree id='comments-embed' parent-id="{{ asset['_id'] }}" {%if not can_edit %}read-only{% endif %}/>
 
 	| {% if config.DEBUG %}
 	.debug-info
@@ -97,7 +97,7 @@ script.
 
 	var activities_url = "{{ url_for('.activities', project_url=project.url, asset_id=asset['_id']) }}";
 	loadActivities(activities_url);  // from 10_tasks.js
-	loadComments("{{ url_for('nodes.comments_for_node', node_id=asset['_id']) }}");
+	new Vue({el:'#comments-embed'});
 
 	$('body').on('pillar:comment-posted', function(e, comment_node_id) {
 		loadActivities(activities_url)
diff --git a/src/templates/attract/layout.pug b/src/templates/attract/layout.pug
index c7f82a7..123431d 100644
--- a/src/templates/attract/layout.pug
+++ b/src/templates/attract/layout.pug
@@ -15,6 +15,8 @@ html(lang="en")
 		script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery-3.1.0.min.js')}}")
 		script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.bootstrap-3.3.7.min.js') }}")
 		script(src="{{ url_for('static_pillar', filename='assets/js/tutti.min.js') }}")
+		script.
+			pillar.utils.initCurrentUser({{ current_user | json | safe }});
 		script(src="{{ url_for('static_attract', filename='assets/js/generated/tutti.min.js') }}")
 
 		link(href="{{ url_for('static_attract', filename='assets/img/favicon.png') }}", rel="shortcut icon")
@@ -88,7 +90,6 @@ html(lang="en")
 		script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.select2.min.js') }}", async=true)
 		script(src="{{ url_for('static_attract', filename='assets/js/vendor/moment-2.15.2.min.js') }}")
 		script(src="{{ url_for('static_attract', filename='assets/js/vendor/pikaday.js') }}")
-
 		| {% if current_user.is_authenticated %}
 		script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.typewatch-3.0.0.min.js') }}")
 		script.
diff --git a/src/templates/attract/shots/view_shot_embed.pug b/src/templates/attract/shots/view_shot_embed.pug
index 402cf1f..ce59bc6 100644
--- a/src/templates/attract/shots/view_shot_embed.pug
+++ b/src/templates/attract/shots/view_shot_embed.pug
@@ -104,7 +104,7 @@
 
 #item-view-feed
 	#activities
-	#comments-embed
+	| <comments-tree id='comments-embed' parent-id="{{ shot['_id'] }}" {%if not can_edit %}read-only{% endif %}/>
 
 	| {% if config.DEBUG %}
 	.debug-info
@@ -129,7 +129,7 @@ script.
 
 	var activities_url = "{{ url_for('.activities', project_url=project.url, shot_id=shot['_id']) }}";
 	loadActivities(activities_url);  // from 10_tasks.js
-	loadComments("{{ url_for('nodes.comments_for_node', node_id=shot['_id'], can_comment=can_edit) }}");
+	new Vue({el:'#comments-embed'});
 
 	$('body').on('pillar:comment-posted', function(e, comment_node_id) {
 		loadActivities(activities_url)
diff --git a/src/templates/attract/tasks/view_task_embed.pug b/src/templates/attract/tasks/view_task_embed.pug
index 1888298..32adcec 100644
--- a/src/templates/attract/tasks/view_task_embed.pug
+++ b/src/templates/attract/tasks/view_task_embed.pug
@@ -142,7 +142,8 @@
 
 #item-view-feed
 	#activities
-	#comments-embed
+	| <comments-tree id='comments-embed' parent-id="{{ task['_id'] }}" {% if not can_edit %}read-only{% endif %}/>
+	
 
 	| {% if config.DEBUG %}
 	.debug-info
@@ -203,6 +204,6 @@ script.
 	});
 
 	loadActivities("{{ url_for('.activities', project_url=project.url, task_id=task['_id']) }}");  // from 10_tasks.js
-	loadComments("{{ url_for('nodes.comments_for_node', node_id=task['_id'], can_comment=can_edit) }}");
+	new Vue({el:'#comments-embed'});
 
 	$('.js-help').openModalUrl('Help', "{{ url_for('attract.help', project_url=project.url) }}");