diff --git a/app/views/annotations/_edit_annotation.html.erb b/app/views/annotations/_edit_annotation.html.erb
index 6fa1e35..dd1b5b7 100644
--- a/app/views/annotations/_edit_annotation.html.erb
+++ b/app/views/annotations/_edit_annotation.html.erb
@@ -4,7 +4,7 @@
 
   <table class="dmp_details_table phase">
     <tr>
-      <td class="first_template"><%= _('Example of Answer')%></td>
+      <td class="first_template"><%= _('example answer')%></td>
       <td>
         <ul>
           <li><%= f.text_area :text, rows: 5 %></li>
diff --git a/app/views/annotations/_show_annotation.html.erb b/app/views/annotations/_show_annotation.html.erb
index 9cc93de..3c95ace 100644
--- a/app/views/annotations/_show_annotation.html.erb
+++ b/app/views/annotations/_show_annotation.html.erb
@@ -2,7 +2,7 @@
 <table class="dmp_details_table phase">
 	<tr>
 		<td class="first_template">
-				<%= _('Example of answer')%>
+				<%= _('Example Answer')%>
 		</td>
 		<td><%= raw annotation.text %></td>
 	</tr>
@@ -11,5 +11,5 @@
 
 <div class="move_2_right">
 	<%= hidden_field_tag :question_id, question.id, class: "question_id" %>
-	<%= link_to _('Edit Example of Answer'), '# ', class: "btn btn-primary edit_form_for_suggested_answer"%>
+	<%= link_to _('Edit Example Answer'), '# ', class: "btn btn-primary edit_form_for_suggested_answer"%>
 </div>
diff --git a/app/views/guidances/_edit_guidance.html.erb b/app/views/guidances/_edit_guidance.html.erb
index 7138ceb..ffae58d 100644
--- a/app/views/guidances/_edit_guidance.html.erb
+++ b/app/views/guidances/_edit_guidance.html.erb
@@ -7,7 +7,7 @@
       <td class="first_template"><%= _('Suggested answer/ Example')%></td>
       <td>
         <ul>
-          <li><%= f.select :is_example, {_('Example of answer') => true, _('Suggested answer') => false} %></li>
+          <li><%= f.select :is_example, {_('Example Answer') => true, _('Suggested answer') => false} %></li>
           <li><%= f.text_area :text, rows: 5 %></li>
         </ul>
       </td>
diff --git a/app/views/phases/_answer_form.html.erb b/app/views/phases/_answer_form.html.erb
index aba7c44..9d7dcd8 100644
--- a/app/views/phases/_answer_form.html.erb
+++ b/app/views/phases/_answer_form.html.erb
@@ -37,7 +37,7 @@
           <% if annotation.text.present? %>   <!-- could be present but empty -->
             <div class="suggested-answer-div">
               <span class="suggested-answer-intro">
-                  <%="#{annotation.org.abbreviation} "%> <%=_('Example of answer')%>
+                  <%="#{annotation.org.abbreviation} "%> <%=_('example answer')%>
               </span>
 
               <div class="suggested-answer-border">
@@ -132,7 +132,7 @@
       <% comments = answer.notes.all %> 
       <%= hidden_field_tag :question_id, question_id, class: "question_id" %>
       <ul class="question_right_column_ul">
-      <% annotations = question.annotations.where("type <> ?", Annotation.types[:guidance]) %>
+      <% annotations = question.annotations.where(type: Annotation.types[:guidance]) %>
       <% if annotations.present? || question_guidances[question_id] %>
         <!-- add css to comment div-->
         <% css_style_comment_div = "display: none;"%>
diff --git a/app/views/questions/_preview_question.html.erb b/app/views/questions/_preview_question.html.erb
index da593ea..d4a709c 100644
--- a/app/views/questions/_preview_question.html.erb
+++ b/app/views/questions/_preview_question.html.erb
@@ -61,7 +61,7 @@
           <% annotation = question.annotations.where(type: Annotation.types[:example_answer]).order(:created_at).first %>
           <div class="suggested-answer-div">
             <span class="suggested-answer-intro">
-                <%= _('Example of answer')%>
+                <%= _('example answer')%>
             </span>
             <div class="suggested-answer-border">
               <p class="suggested-answer">
@@ -80,7 +80,7 @@
         <% if !annotations.blank? %>
           <div class="suggested-answer-div">
             <span class="suggested-answer-intro">
-                <%= _('Example of answer')%>
+                <%= _('example answer')%>
             </span>
             <div class="suggested-answer-border">
               <p class="suggested-answer">
diff --git a/app/views/questions/_show_question.html.erb b/app/views/questions/_show_question.html.erb
index 1f3423b..0518453 100644
--- a/app/views/questions/_show_question.html.erb
+++ b/app/views/questions/_show_question.html.erb
@@ -67,7 +67,7 @@
       <% if example_answer.present?  && example_answer.text.present?  %>
         <tr>
           <td class="first_template">
-            <%= _('Example of answer')%>
+            <%= _('example answer')%>
           </td>
           <td><%= raw example_answer.text %></td>
         </tr>
diff --git a/app/views/templates/_edit_annotations.html.erb b/app/views/templates/_edit_annotations.html.erb
index 443f6cb..8273f4d 100644
--- a/app/views/templates/_edit_annotations.html.erb
+++ b/app/views/templates/_edit_annotations.html.erb
@@ -44,7 +44,7 @@
 
     <!-- Suggested answer or Example-->
     <tr>
-      <td class="first_template"><%= _('Example of Answer')%></td>
+      <td class="first_template"><%= _('example answer')%></td>
       <td>
         <div class="div_left_icon">
           <% annotations = question.annotations.where(org_id: current_user.org_id).where(type: Annotation.types[:example_answer]).order(:created_at).first %>
diff --git a/config/locale/app.pot b/config/locale/app.pot
index 1e57dc4..cef3cb2 100644
--- a/config/locale/app.pot
+++ b/config/locale/app.pot
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: app 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-26 15:50+0100\n"
-"PO-Revision-Date: 2017-05-26 15:50+0100\n"
+"POT-Creation-Date: 2017-05-31 12:56+0100\n"
+"PO-Revision-Date: 2017-05-31 12:56+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -501,7 +501,7 @@
 msgid "Edit"
 msgstr ""
 
-msgid "Edit Example of Answer"
+msgid "Edit Example Answer"
 msgstr ""
 
 msgid "Edit User Privileges"
@@ -567,12 +567,6 @@
 msgid "Example Answer"
 msgstr ""
 
-msgid "Example of Answer"
-msgstr ""
-
-msgid "Example of answer"
-msgstr ""
-
 msgid "Export"
 msgstr ""
 
@@ -1575,9 +1569,6 @@
 msgid "approx. %{space_used}%% of available space used (max %{num_pages} pages)"
 msgstr ""
 
-msgid "by"
-msgstr ""
-
 msgid "by "
 msgstr ""
 
diff --git a/config/locale/de/app.po b/config/locale/de/app.po
index 7251de4..1da96cc 100644
--- a/config/locale/de/app.po
+++ b/config/locale/de/app.po
@@ -535,7 +535,7 @@
 msgstr "Bearbeiten"
 
 #, fuzzy
-msgid "Edit Example of Answer"
+msgid "Edit Example Answer"
 msgstr "Beispielantwort"
 
 msgid "Edit User Privileges"
@@ -603,13 +603,6 @@
 msgid "Example Answer"
 msgstr "Beispielantwort"
 
-#, fuzzy
-msgid "Example of Answer"
-msgstr "Beispielantwort"
-
-msgid "Example of answer"
-msgstr "Beispielantwort"
-
 msgid "Export"
 msgstr "Export"
 
@@ -1672,9 +1665,6 @@
 msgid "approx. %{space_used}%% of available space used (max %{num_pages} pages)"
 msgstr "annährend %{space_used}% des verfügbaren Platzes wird verwendet (max. %{num_pages} Seiten)"
 
-msgid "by"
-msgstr ""
-
 #, fuzzy
 msgid "by "
 msgstr " von "
diff --git a/config/locale/en_GB/app.po b/config/locale/en_GB/app.po
index 244d1d9..510f97c 100644
--- a/config/locale/en_GB/app.po
+++ b/config/locale/en_GB/app.po
@@ -519,7 +519,7 @@
 msgstr "Edit"
 
 #, fuzzy
-msgid "Edit Example of Answer"
+msgid "Edit Example Answer"
 msgstr "Example of answer"
 
 msgid "Edit User Privileges"
@@ -586,13 +586,6 @@
 msgid "Example Answer"
 msgstr "Example of answer"
 
-#, fuzzy
-msgid "Example of Answer"
-msgstr "Example of answer"
-
-msgid "Example of answer"
-msgstr "Example of answer"
-
 msgid "Export"
 msgstr "Export"
 
@@ -1626,9 +1619,6 @@
 msgid "approx. %{space_used}%% of available space used (max %{num_pages} pages)"
 msgstr "approx. %{space_used}%% of available space used (max %{num_pages} pages)"
 
-msgid "by"
-msgstr ""
-
 #, fuzzy
 msgid "by "
 msgstr " by "
diff --git a/config/locale/en_US/app.po b/config/locale/en_US/app.po
index dbb07f4..af5a1be 100644
--- a/config/locale/en_US/app.po
+++ b/config/locale/en_US/app.po
@@ -519,7 +519,7 @@
 msgstr "Edit"
 
 #, fuzzy
-msgid "Edit Example of Answer"
+msgid "Edit Example Answer"
 msgstr "Example of answer"
 
 msgid "Edit User Privileges"
@@ -586,13 +586,6 @@
 msgid "Example Answer"
 msgstr "Example of answer"
 
-#, fuzzy
-msgid "Example of Answer"
-msgstr "Example of answer"
-
-msgid "Example of answer"
-msgstr "Example of answer"
-
 msgid "Export"
 msgstr "Export"
 
@@ -1626,9 +1619,6 @@
 msgid "approx. %{space_used}%% of available space used (max %{num_pages} pages)"
 msgstr "approx. %{space_used}%% of available space used (max %{num_pages} pages)"
 
-msgid "by"
-msgstr ""
-
 #, fuzzy
 msgid "by "
 msgstr " by "
diff --git a/config/locale/es/app.po b/config/locale/es/app.po
index c7cfe48..c0cf399 100644
--- a/config/locale/es/app.po
+++ b/config/locale/es/app.po
@@ -531,7 +531,7 @@
 msgstr "Editar"
 
 #, fuzzy
-msgid "Edit Example of Answer"
+msgid "Edit Example Answer"
 msgstr "Respuesta de ejemplo"
 
 msgid "Edit User Privileges"
@@ -599,13 +599,6 @@
 msgid "Example Answer"
 msgstr "Respuesta de ejemplo"
 
-#, fuzzy
-msgid "Example of Answer"
-msgstr "Respuesta de ejemplo"
-
-msgid "Example of answer"
-msgstr "Respuesta de ejemplo"
-
 msgid "Export"
 msgstr "Exportar"
 
@@ -1657,9 +1650,6 @@
 msgid "approx. %{space_used}%% of available space used (max %{num_pages} pages)"
 msgstr "aprox. %{space_used}% de disponibilidad del espacio usado (máx. %{num_pages} páginas)"
 
-msgid "by"
-msgstr ""
-
 #, fuzzy
 msgid "by "
 msgstr " por "
diff --git a/config/locale/fr/app.po b/config/locale/fr/app.po
index fc41878..7879c76 100644
--- a/config/locale/fr/app.po
+++ b/config/locale/fr/app.po
@@ -529,7 +529,7 @@
 msgstr "Modifier"
 
 #, fuzzy
-msgid "Edit Example of Answer"
+msgid "Edit Example Answer"
 msgstr "Exemple de réponse"
 
 msgid "Edit User Privileges"
@@ -597,13 +597,6 @@
 msgid "Example Answer"
 msgstr "Exemple de réponse"
 
-#, fuzzy
-msgid "Example of Answer"
-msgstr "Exemple de réponse"
-
-msgid "Example of answer"
-msgstr "Exemple de réponse"
-
 msgid "Export"
 msgstr "Exporter"
 
@@ -1654,9 +1647,6 @@
 msgid "approx. %{space_used}%% of available space used (max %{num_pages} pages)"
 msgstr "env. %{space_used}% despace disponible utilisé (%{num_pages} pages maxi)"
 
-msgid "by"
-msgstr ""
-
 #, fuzzy
 msgid "by "
 msgstr " par "