diff --git a/app/views/legislation/annotations/_form.html.erb b/app/views/legislation/annotations/_form.html.erb
index 81605e648..5662cafe2 100644
--- a/app/views/legislation/annotations/_form.html.erb
+++ b/app/views/legislation/annotations/_form.html.erb
@@ -8,24 +8,17 @@
 
 <div class="comments-wrapper">
   <div class="comment-input">
-    <%= form_for [@process, @draft_version, Annotation.new], url: legislation_process_draft_version_annotations_path(@process, @draft_version), remote: true do |f| %>
+    <%= form_for Legislation::Annotation.new, url: legislation_process_draft_version_annotations_path(@process, @draft_version), remote: true do |f| %>
       <%= f.text_area :text, autofocus: true %>
 
       <div class="comment-actions">
-        <a class="cancel-comment" href="#"><%= t('legislation.annotations.comments.cancel') %></a>
+        <a class="cancel-comment" href="#" data-cancel-annotation><%= t('legislation.annotations.comments.cancel') %></a>
         <%= f.submit t('legislation.annotations.comments.publish_comment'), class: 'button strong publish-comment' %>
-        <% if false %>
-          <a class="button strong publish-comment" title="<%= t('legislation.annotations.comments.publish_comment') %>" href="#"><%= t('legislation.annotations.comments.publish_comment') %></a>
-        <% end %>
       </div>
 
       <%= f.hidden_field :quote %>
       <%= f.hidden_field :ranges %>
     <% end %>
   </div>
-
-  <div class="comment-footer">
-    <a class="button strong" title="Ver todos" href="#">Ver todos</a>
-  </div>
 </div>
 
diff --git a/config/locales/activerecord.en.yml b/config/locales/activerecord.en.yml
index e873abc26..51ee2190b 100644
--- a/config/locales/activerecord.en.yml
+++ b/config/locales/activerecord.en.yml
@@ -139,10 +139,12 @@ en:
         status: Status
         final_version: Final version
       legislation/question:
-        title: "Title"
+        title: Title
         question_options: Options
       legislation/question_option:
-        value: "Value"
+        value: Value
+      legislation/annotation:
+        text: Comment
     errors:
       models:
         user:
diff --git a/config/locales/activerecord.es.yml b/config/locales/activerecord.es.yml
index e8f2a42eb..aa7e05875 100644
--- a/config/locales/activerecord.es.yml
+++ b/config/locales/activerecord.es.yml
@@ -134,10 +134,12 @@ es:
         status: Estado
         final_version: Versión final
       legislation/question:
-        title: "Título"
+        title: Título
         question_options: Respuestas
       legislation/question_option:
-        value: "Valor"
+        value: Valor
+      legislation/annotation:
+        text: Comentario
     errors:
       models:
         user: