diff --git a/app/models/survey/question.rb b/app/models/survey/question.rb
index 892a038..7610ca2 100644
--- a/app/models/survey/question.rb
+++ b/app/models/survey/question.rb
@@ -4,7 +4,7 @@ class Survey::Question < ActiveRecord::Base
   has_many :choices, dependent: :destroy
   has_many :answers, through: :choices
   include IsCommentable
-  FLAG_ICONS={"delete" => "fa fa-trash"}
+  FLAG_ICONS={"delete" => "fa fa-trash", "template"=> "ffi1-cleaning1"}
   FLAG_CONFIRM={}
   scope :templates, ->{ where(flag_template:true)}
   acts_as_flagable
diff --git a/app/views/flags/_flag.js.erb b/app/views/flags/_flag.js.erb
index fe82719..beda173 100644
--- a/app/views/flags/_flag.js.erb
+++ b/app/views/flags/_flag.js.erb
@@ -1 +1 @@
-$('#<%=@obj.flaglinkid(params[:flag]) %>').replaceWith("<%= escape_javascript( render(partial: "flags/flaglink", format: "html", locals: {flag: params[:flag]}) )%>"); 
+$('#<%=@obj.flaglinkid(params[:flag]) %>').replaceWith("<%= escape_javascript( flag_link(@obj,flag)) %>"); 
diff --git a/app/views/flags/_flaglink.html.erb b/app/views/flags/_flaglink.html.erb
index 3c515df..e69de29 100644
--- a/app/views/flags/_flaglink.html.erb
+++ b/app/views/flags/_flaglink.html.erb
@@ -1,2 +0,0 @@
-<%       fi = {"badquality"=>"fa fa-flag", "delete"=>"fa fa-trash"} %>
-<%=  flag_link(@obj,flag, ff_icon(fi[flag])) %>
diff --git a/app/views/survey/questions/_answeredquestion.html.erb b/app/views/survey/questions/_answeredquestion.html.erb
index 554a364..4060bfa 100644
--- a/app/views/survey/questions/_answeredquestion.html.erb
+++ b/app/views/survey/questions/_answeredquestion.html.erb
@@ -1,68 +1,66 @@
-<div id="container_question_<%= answeredquestion.id %>" style="min-width: 310px; max-width: 800px; height: <%= (100+answeredquestion.choices.count * 90).to_s%>px; margin: 0 auto" class="contentbox">
-<div style="background:red"><b><%= answeredquestion.title%></b>
-
-	<ul>
-		<% answeredquestion.choices.each do |c| %>
-			<li>
-				<%= c.to_s %>: <%= answeredquestion.answers.where(choice_id: c.id).count %> votes
-			</li>
-		<% end %>
-	</ul>
-	
-
-</div>
-<script>
-$(function () {
+<div id="container_question_<%= answeredquestion.id %>" style="min-width: 310px; max-width: 800px; height: <%= (100+answeredquestion.choices.count * 90).to_s %>px; margin: 0 auto" class="contentbox">
+	<div style="background:red">
+		<b><%= answeredquestion.title%></b>
+		<ul>
+			<% answeredquestion.choices.each do |c| %>
+				<li>
+					<%= c.to_s %>: <%= answeredquestion.answers.where(choice_id: c.id).count %> votes
+				</li>
+			<% end %>
+		</ul>
+	</div>
+	<script>
+	$(function () {
     $('#container_question_<%= answeredquestion.id %>').highcharts({
-        chart: {
-            type: 'bar'
-        },
+      chart: {
+        type: 'bar'
+      },
+      title: {
+        text: '<%= answeredquestion.title%>'
+      },
+      subtitle: {
+        text: '<%= answeredquestion.text %>'
+      },
+      xAxis: {
+        categories: [<%= raw(answeredquestion.choices.map{|c| "'"+escape_javascript(c.html)+"'"}.join(",")) %>],
         title: {
-            text: '<%= answeredquestion.title%>'
+          text: null
         },
-        subtitle: {
-            text: '<%= answeredquestion.text %>'
+				labels: {
+					useHTML: true
+				}
+      },
+      yAxis: {
+        min: 0,
+        title: {
+          text: 'Answers',
+          align: 'high'
         },
-        xAxis: {
-            categories: [<%= raw(answeredquestion.choices.map{|c| "'"+escape_javascript(c.html)+"'"}.join(",")) %>],
-            title: {
-                text: null
-            },
-					labels: {
-						useHTML: true
-					}
+        labels: {
+          overflow: 'justify'
         },
-        yAxis: {
-            min: 0,
-            title: {
-                text: 'Answers',
-                align: 'high'
-            },
-            labels: {
-                overflow: 'justify'
-            },
-					minTickInterval: 1
-        },
-        tooltip: {
-            valueSuffix: ' votes'
-        },
-        plotOptions: {
-            bar: {
-                dataLabels: {
-                    enabled: true
-                }
-            }
-        },
-        credits: {
-            enabled: false
-        },
-        series: [{
-            name: '<%= answeredquestion.title%>',
-            data: [<%= raw(answeredquestion.choices.map{|c| c.answers.count.to_s}.join(",")) %>]
-        }]
+				minTickInterval: 1
+      },
+      tooltip: {
+        valueSuffix: ' votes'
+      },
+      plotOptions: {
+        bar: {
+          dataLabels: {
+            enabled: true
+          }
+        }
+      },
+      credits: {
+        enabled: false
+      },
+      series: [{
+        name: '<%= answeredquestion.title %>',
+        data: [<%= raw(answeredquestion.choices.map{|c| c.answers.count.to_s}.join(",")) %>]
+      }]
     });
-});
-</script>
+	});
+	</script>
 
 
 </div>
diff --git a/app/views/survey/questions/_question.html.erb b/app/views/survey/questions/_question.html.erb
index 0c79021..d62e0f8 100644
--- a/app/views/survey/questions/_question.html.erb
+++ b/app/views/survey/questions/_question.html.erb
@@ -1,12 +1,15 @@
 <% if current_user.nil? %>
 	<%= div_tag_for(question) do%>
-<%= render partial: "survey/questions/answeredquestion", object: question %> 
+		<%= render partial: "survey/questions/answeredquestion", object: question %> 
 	<% end %>
 <% else  %>
 	<div class="contentbox" id ="<%= divid_for(question) %>" style="">
 		<div >
-			<b><%= question.title%></b> <%=question.text%><%= link_to fa_icon("pencil"), edit_survey_question_path(question) , class: "btn btn-link navbar-btn" , remote: true%>
+			<b><%= question.title%></b> 
+			<%= question.text %>
+			<%= link_to fa_icon("pencil"), edit_survey_question_path(question) , class: "btn btn-link navbar-btn" , remote: true %>
 			<%= flag_link(question, "delete")%>
+			<%= flag_link(question, "template")%>
 
 			<ul class="choice-list">
 				<% question.choices.each do |c| %>