diff --git a/core/lib/i18n/en.i18n.json b/core/lib/i18n/en.i18n.json
index 4d2d1d56b9..6055f4f81a 100644
--- a/core/lib/i18n/en.i18n.json
+++ b/core/lib/i18n/en.i18n.json
@@ -150,6 +150,8 @@
   "feedback_remove_button": "Remove",
   "feedback_submitted_by": "submitted by",
   "feedback_view_button": "View",
+  "feedback_sendFeedback": "Send",
+  "feedbackForm_successMessage": "Thank you! Your feedback has been successfully sent.",
   "flagApiButton_buttonText": "Flag",
   "flagApiButton_buttonText_active": "Flagged",
   "flagApiModal_cancelButton": "Cancel",
diff --git a/documentation/client/manage/manage.js b/documentation/client/manage/manage.js
index 88c5e6cf94..f1e5454195 100644
--- a/documentation/client/manage/manage.js
+++ b/documentation/client/manage/manage.js
@@ -65,17 +65,12 @@ Template.manageApiDocumentationModal.events({
 
       // Remove documenation file id field
       Apis.update(instance.data.api._id, { $unset: { documentationFileId: '' } });
-<<<<<<< HEAD
 
       // Get deletion success message translation
       const message = TAPi18n.__('manageApiDocumentationModal_DeletedFile_Message');
 
       // Alert user of successful deletion
       sAlert.success(message);
-=======
-
-      sAlert.success(TAPi18n.__('manageApiDocumentationModal_DeletedFile_Message'));
->>>>>>> 8a78101cf5b33ffae10ffc91ecb53f09517c5d37
     }
   },
   'click #save-documentation-link': function (event, instance) {
diff --git a/feedback/client/form/autoform.js b/feedback/client/form/autoform.js
index 8ff7c3702a..f0b9a795cf 100644
--- a/feedback/client/form/autoform.js
+++ b/feedback/client/form/autoform.js
@@ -13,6 +13,8 @@ AutoForm.hooks({
 
       // Alert user of success
       sAlert.success(message);
+
+      Modal.hide('feedbackForm');
     },
   },
 });
diff --git a/feedback/client/form/form.html b/feedback/client/form/form.html
index 4536d9f7a8..714f255d4c 100644
--- a/feedback/client/form/form.html
+++ b/feedback/client/form/form.html
@@ -1,24 +1,33 @@
 <template name="feedbackForm">
-  <button type="button" class="btn btn-info btn-xs pull-right feedback-form-button" data-toggle="modal" data-target="#feedbackForm" data-backdrop="static" data-keyboard="false"><i class="fa fa-comments-o"></i>&nbsp;{{_ "feedback_feedbackForm_button"}}</button>
-  <div class="modal fade" id="feedbackForm" tabindex="-1" role="dialog" aria-labelledby="feedbackFormLabel">
+  <div
+    class="modal fade"
+    id="feedbackFormModal"
+    tabindex="-1"
+    role="dialog"
+    aria-labelledby="feedbackFormModalLabel" >
     <div class="modal-dialog" role="document">
       <div class="modal-content">
         <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-          <h4 class="modal-title" id="feedbackFormLabel">
-            <i class="fa fa-comments-o"></i>&nbsp;
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+          </button>
+          <h4 class="modal-title" id="feedbackFormModalLabel">
             {{_ "feedback_feedbackForm_title"}}
           </h4>
         </div>
-        <div class="modal-body">
-          <p>{{_ "feedback_feedbackForm_description"}}</p>
-          {{> quickForm
-            collection=feedbackCollection
-            id="feedbackForm"
-            type="insert"
-            omitFields="authorId, createdAt, apiBackendId"
-          }}
-        </div>
+        {{ # autoForm id="feedbackForm" collection=feedbackCollection type="insert" }}
+          <div class="modal-body">
+            <p>{{_ "feedback_feedbackForm_description"}}</p>
+            {{> afQuickField name='topic'}}
+            {{> afQuickField name='message' rows=4}}
+            {{> afQuickField name='messageType'}}
+          </div>
+          <div class="modal-footer">
+            <button type="submit" class="btn btn-primary">
+              {{ _ "feedback_sendFeedback" }}
+            </button>
+          </div>
+        {{/autoForm}}
       </div>
     </div>
   </div>
diff --git a/feedback/client/form/form.js b/feedback/client/form/form.js
index 5cefcc79e4..5e29c9bbd3 100644
--- a/feedback/client/form/form.js
+++ b/feedback/client/form/form.js
@@ -1,4 +1,4 @@
-// Collection import
+import { Template } from 'meteor/templating';
 import { Feedback } from '../../collection';
 
 Template.feedbackForm.helpers({
diff --git a/feedback/client/list/list.html b/feedback/client/list/list.html
index 5f231f439a..b85eed0bd5 100644
--- a/feedback/client/list/list.html
+++ b/feedback/client/list/list.html
@@ -1,9 +1,18 @@
 <template name="feedbackList">
   <div class="panel panel-default">
     <div class="panel-heading">
-      {{#if currentUser}}
-        {{> feedbackForm }}
-      {{/ if }}
+      {{ # if currentUser }}
+        <button
+          type="button"
+          class="btn btn-info btn-xs pull-right feedback-form-button"
+          id="add-feedback"
+          >
+            <i class="fa fa-comments-o"></i>
+            &nbsp;
+            {{_ "feedback_feedbackForm_button"}}
+        </button>
+        {{ > feedbackForm }}
+      {{ / if }}
       <h2 class="panel-title clearfix">
         {{_ "feedback_main_title"}}
       </h2>
diff --git a/feedback/client/list/list.js b/feedback/client/list/list.js
index 0915890857..aaf1ff7716 100644
--- a/feedback/client/list/list.js
+++ b/feedback/client/list/list.js
@@ -1,18 +1,20 @@
+import { Meteor } from 'meteor/meteor';
+import { Template } from 'meteor/templating';
 import { Feedback } from '../../collection';
 
-Template.feedbackList.created = function () {
+Template.feedbackList.onCreated(function () {
   // Get API Backend ID from URL route
   const apiId = this.data.api._id;
 
   // Subscribe for all feedback for this API Backend
   this.subscribe('apiBackendFeedback', apiId);
-};
+});
 
 Template.feedbackList.helpers({
-  'userFeedback': function () {
+  userFeedback () {
     return Feedback.find();
   },
-  'haveFeedback': function () {
+  haveFeedback () {
     // Count user's feedback in feedback collection
     const feedbackCount = Feedback.find().count();
     return feedbackCount > 0;
@@ -24,4 +26,7 @@ Template.feedbackList.events({
   'click .delete-feedback': function (event) {
     Meteor.call('deleteFeedback', this._id);
   },
+  'click #add-feedback': function () {
+    Modal.show('feedbackForm');
+  },
 });
diff --git a/feedback/collection/schema.js b/feedback/collection/schema.js
index 4e57d720b1..24bbb5c56f 100644
--- a/feedback/collection/schema.js
+++ b/feedback/collection/schema.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 import { Feedback } from './';
 
 Feedback.schema = new SimpleSchema({
@@ -37,9 +38,9 @@ Feedback.schema = new SimpleSchema({
     autoValue () {
       if (this.isInsert) {
         return Meteor.userId();
-      } else {
-        this.unset();
       }
+
+      this.unset();
     },
     denyUpdate: true,
   },
@@ -53,9 +54,9 @@ Feedback.schema = new SimpleSchema({
         return new Date();
       } else if (this.isUpsert) {
         return { $setOnInsert: new Date() };
-      } else {
-        this.unset();
       }
+
+      this.unset();
     },
   },
 });