--- a/swtr/static/js/img_swtr.js
+++ b/swtr/static/js/img_swtr.js
@@ -104,7 +104,8 @@
   swtr.ImgAnnoView = Backbone.View.extend({
     el: $('#img-annotation-wrapper'),
     events: {
-      'change #custom-dropdown': 'getFormValue',
+      'keydown .annotorious-editor-button-save': 'getFormValue',
+      'mousedown .annotorious-editor-button-save': 'getFormValue',
       'click #toggle-anno-areas': 'toggleAnnoAreas'
     },
     initialize: function(options) {

@@ -155,8 +156,9 @@
     updateNewAnno: function(annotation) {
       console.log('updateNewAnno()');
       var self = swtr.imgAnnoView;
+        console.log(annotation.text);
       // get the final value/input from the editor
-      var selected = $('select option:selected').text().toLowerCase();
+     /* var selected = $('select option:selected').text().toLowerCase();
       var text_input = $('.annotorious-editor-text').val();
       if( selected === "tags") {
         self.new_anno[selected] = $('#tags-input').tags().getTags();


@@ -164,12 +166,13 @@
       else {
         // update it in our annotation object
         self.new_anno[selected] = text_input;
-      }
+      }*/
       // prepare the text field
+      self.new_anno.comment = annotation.text;
       self.new_anno.text = self.createPopupText(self.new_anno);
       // update the annotorious annotation object with the new values
       if(self.new_anno.comment) {
-        annotation.comment = self.new_anno.comment;
+        annotation.comment = annotation.text;
       }
       if(self.new_anno.link) {
         annotation.link = self.new_anno.link;


@@ -189,16 +192,41 @@
       console.log('hideOriginalEditor()');
       var self = swtr.imgAnnoView;
       self.new_anno = {};
+        $('#tags-input').tags({
+          tagSize: 'md',
+          promptText: 'Type word (and press enter)..',
+          caseInsensitive: true,
+          suggestions: self.tags_suggestions
+        });
       self.getSuggestionsForTags();
       //$('.annotorious-editor-text').hide();
       //$('.annotorious-editor').css('width', '100%');
     },
     getFormValue: function(event) {
       console.log('getFormValue()');
-
       var self = swtr.imgAnnoView;
       // show the editor field to input text
-      var $anno_form = $('.annotorious-editor-text');
+      $('.annotorious-editor-text').each(function(index, element) {
+        if( index === 0) {
+          self.new_anno['comment'] = $(element).text();
+        console.log(index, $(element).text() );
+        }
+        else if ( index === 1) {
+          self.new_anno['title'] = $(element).val();
+        console.log(index, $(element).val() );
+        }
+        else if (index === 2) {
+          self.new_anno['link'] = $(element).val();
+        console.log(index, $(element).val() );
+        }
+        else {
+          self.new_anno['tags'] = $(element).tags().getTags();
+        console.log(index, $('#tags-input').tags().getTags() );
+        }
+        
+      });
+      // show the editor field to input text
+    /*  var $anno_form = $('.annotorious-editor-text');
       //$anno_form.slideDown();
       // get the previous item entered
       var $selected = $('select option:selected');


@@ -217,23 +245,18 @@
       }
 
       // if the current selected is tags
-      if($selected.text() === 'Tags') {
         $('#tags-input').tags({
           tagSize: 'md',
           promptText: 'Type word (and press enter)..',
           caseInsensitive: true,
           suggestions: self.tags_suggestions
         });
-        $('#tags-input').show();
-        $('.annotorious-editor-text').hide();
-      }
-      else {
-        $('#tags-input').hide();
-        $('.annotorious-editor-text').show();
-      }
-      $anno_form.val('');
+    
+      
+     /* $anno_form.val('');
       $anno_form.attr('placeholder', 'Add ' + $selected.text());
-      console.log(self.new_anno);
+      console.log(self.new_anno);*/
+
     },
     createPopupText: function(annotation) {
       // title
--- a/swtr/static/js/lib/custom-fields-plugin.js
+++ b/swtr/static/js/lib/custom-fields-plugin.js
@@ -1,7 +1,7 @@
 annotorious.plugin.CustomFields = function(opt_config_options) {
 
   annotorious.plugin.CustomFields.prototype.onInitAnnotator = function(annotorious) {
-    var dropDownTemplate= _.template($('#dropdown-template').html()); // creates the HTML element for dropdown - from template in index.html
+    var dropDownTemplate= _.template($('#customEdit-template').html()); // creates the HTML element for dropdown - from template in index.html
     annotorious.editor.addField(dropDownTemplate);  // add dropdown to editor UI widget
     annotorious.popup.addField( function(annotation){
       var popupTemplate = _.template($('#popup-template').html()); //created a popup template - yet to find how to bind it to newanno
--- a/swtr/templates/index.html
+++ b/swtr/templates/index.html
@@ -234,7 +234,7 @@
         <p><%= how %></p>
       </li>
     </script>
-    <script type="text/template" id="dropdown-template">
+    <!--script type="text/template" id="dropdown-template">
       <div id="tags-input"></div>
       <select class="form-control" id="custom-dropdown">
         <option value="comment" selected>Comment</option>
@@ -242,6 +242,19 @@
         <option value="tags">Tags</option>
         <option value="link">Link</option>
       </select>
+    </script-->
+    <script type="text/template" id="customEdit-template">
+     <textarea id="title-input" class="annotorious-editor-text goog-textarea" placeholder="Add
+       Title" tabindex="1" rows="2" style="overflow-y: hidden; overflow-x:
+       auto; box-sizing: border-box; height: 23px; padding-bottom:
+       4px;"></textarea>
+    <textarea id="link-input" class="annotorious-editor-text goog-textarea" placeholder="Add
+      Links" tabindex="1" rows="3" style="overflow-y: hidden; overflow-x: auto;
+      box-sizing: border-box; height: 23px; padding-bottom: 4px;"></textarea>
+   <div id="tags-input" class="annotorious-editor-text goog-textarea"
+     placeholder="" tabindex="1" rows="4" style="overflow-y: auto; overflow-x:
+     hidden;
+     box-sizing: border-box; height: 23px; padding-bottom: 4px;"></textarea> 
     </script>
     <script type="text/template" id="popup-template">
       <span class="annotorious-popup-text">