diff --git a/app/views/desktop/index.html.erb b/app/views/desktop/index.html.erb
index c61aec8e..efa90f1f 100644
--- a/app/views/desktop/index.html.erb
+++ b/app/views/desktop/index.html.erb
@@ -13,7 +13,7 @@
 
         <li class="dock_item"><a callback-method='initializeJournalPapers' href="<%= panel_personal_journal_desktop_journal_window_path %>" class="widget_fn wh3 hh3" id='d_journal_p' custom-load="journal" onclick="return false;"><span class="widget_icon"><img src="" alt="Journal Papers" id="journal_p_icon" width="30" height="30"/></span></a></li>
 
-        <li class="dock_item"><a callback-method='initializeConference' href="<%= panel_personal_conference_desktop_conference_window_path %>" class="widget_fn wh3 hh3" id='d_conference_p' custom-load="conference" onclick="return false;"><span class="widget_icon"><img src="" alt="Conference Papers" id="conference_p_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item"><a callback-method='initializeConferencePapers' href="<%= panel_personal_conference_desktop_conference_window_path %>" class="widget_fn wh3 hh3" id='d_conference_p' custom-load="conference" onclick="return false;"><span class="widget_icon"><img src="" alt="Conference Papers" id="conference_p_icon" width="30" height="30"/></span></a></li>
 
         <li class="dock_item"><a callback-method='initializeBooks' href="<%= desktop_publications_books_path %>" class="widget_fn wh3 hh3" id='d_books' onclick="return false;"><span class="widget_icon"><img src="" alt="Books" id="books_icon" width="30" height="30"/></span></a></li>
 
diff --git a/vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js b/vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js
index 913011d8..eaefe0f5 100644
--- a/vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js
+++ b/vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js
@@ -36,6 +36,11 @@ orbitDesktop.prototype.initializeConferencePapers = function(target,url,cache){
           o.notify(data.msg,"success");
         }
     }
+
+    this.initializeConferencePapers.editpaper = function(){
+      o.highlight_sub_menu_item(1)
+    }
+
     this.initializeConferencePapers.addpaper = function(){ // to open add pages in conference papers page
       var bindHandlers = function(){ // to bind handlers for add page
         o.simple_drop_down();
@@ -63,7 +68,6 @@ orbitDesktop.prototype.initializeConferencePapers = function(target,url,cache){
     this.initializeConferencePapers.conference = function(){ // to open add pages in conference papers page
       var bindHandlers = function(){ // to bind handlers for add page
         o.simple_drop_down();
-        
       }
       bindHandlers();
     }
@@ -71,7 +75,7 @@ orbitDesktop.prototype.initializeConferencePapers = function(target,url,cache){
     this.initializeConferencePapers.coAuthorformCallback = function(data){
         if(data.success){
           o.notify(data.msg,"success");
-          o.sub_menu_item($("div[content-type=menu] a").eq(0));
+          o.sub_menu_item($("div[content-type=menu] a").eq(3));
         }else{
           o.notify(data.msg,"alert");
         }
diff --git a/vendor/built_in_modules/personal_conference/app/helpers/panel/personal_conference/desktop/conference_pages_helper.rb b/vendor/built_in_modules/personal_conference/app/helpers/panel/personal_conference/desktop/conference_pages_helper.rb
index 4dcb8ce3..c30254c4 100644
--- a/vendor/built_in_modules/personal_conference/app/helpers/panel/personal_conference/desktop/conference_pages_helper.rb
+++ b/vendor/built_in_modules/personal_conference/app/helpers/panel/personal_conference/desktop/conference_pages_helper.rb
@@ -50,6 +50,7 @@ module Panel::PersonalConference::Desktop::ConferencePagesHelper
       content_tag(:a, t("edit"),
        :class => "journal_paper_edit admbg2 admtxt",
        :href => edit_panel_personal_conference_desktop_conference_page_path(publication),
+       "callback-method" => "editpaper",
        "ajax-remote" => "get") + \
       content_tag(:a, t("delete"),
         "ajax-remote" => "delete",
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_form.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_form.html.erb
index d6f16b23..5b5bfc3f 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_form.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_form.html.erb
@@ -5,7 +5,7 @@
       value: (@conference_co_author_relation.relation_translations[locale] rescue nil) %>
 <#% end %>
 -->
-<%= f.submit "Save", class: "ini_input hp hh2 thmtxt thmc2", style: "margin-left: 10px;" %>
+<%= f.submit t("save"), class: "ini_input hp hh2 thmtxt thmc2", style: "margin-left: 10px;" %>
 <% if not @conference_co_author_relation.new_record? %>
-  <%= submit_tag "Cancel", :type => "button", class: "bt-cancel-type ini_input hp hh2 thmtxt" %>
+  <%= submit_tag t("cancel"), "ajax-remote" => "get", :herf => panel_personal_conference_desktop_conference_co_author_relations_path ,:type => "button", class: "bt-cancel-type ini_input hp hh2 thmtxt" %>
 <% end %>
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/new.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/new.html.erb
index 14e5a8b5..54901469 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/new.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/new.html.erb
@@ -1,3 +1,3 @@
-<%= form_for @conference_co_author, html: { multipart: true ,"form-type"=>"ajax_form", "callback-method"=>"conferenceCoAuthorformCallback"} , url: panel_personal_conference_desktop_conference_co_authors_path do |f| %>
+<%= form_for @conference_co_author, html: { multipart: true ,"form-type"=>"ajax_form", "callback-method"=>"coAuthorformCallback"} , url: panel_personal_conference_desktop_conference_co_authors_path do |f| %>
   <%= render partial: 'form', locals: {:f => f} %>
 <% end %>
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
index 163c2d3c..1a5ea28f 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
@@ -213,14 +213,16 @@
 
 
     <script>
-      $(function() {
-        $("#writing_conference_author_tokens").tokenInput("/panel/personal_conference/desktop/conference_pages/new.json", {
-          crossDomain: false,
-          prePopulate: $("#writing_conference_author_tokens").data("pre"),
-          theme: "facebook",
-          hintText: "<%=t("hintText")%>",
-          noResultsText: "<%=t("noResultsText")%>",
-          searchingText: "<%=t("searchingText")%>"
+      $(document).ready(function(){
+        $(function() {
+          $("#writing_conference_author_tokens").tokenInput("/panel/personal_conference/desktop/conference_pages/new.json", {
+            crossDomain: false,
+            prePopulate: $("#writing_conference_author_tokens").data("pre"),
+            theme: "facebook",
+            hintText: "<%=t("hintText")%>",
+            noResultsText: "<%=t("noResultsText")%>",
+            searchingText: "<%=t("searchingText")%>"
+          });
         });
       });
     </script>
@@ -231,21 +233,7 @@
     </script>
 
     <script>
-      $('#add_plugin_file a.add').click(function(){
-        var new_id = $(this).prev().attr('value');
-        var old_id = new RegExp("new_writing_conference_files", "g");
-        $(this).prev().attr('value', parseInt(new_id) + 1);
-        var newfield = $(("<%= escape_javascript(add_attribute 'form_file', f, :writing_conference_files) %>").replace(old_id, new_id));
-        $(this).parents('table').append(newfield);
-        newfield.find('.action a.delete').click(function(){
-          newfield.remove();
-        });
-        return false;
-      });
-
-      $('.action a.remove_existing_record').click(function(){
-        $(this).next('.should_destroy').attr('value', 1);
-        $("tr#add_plugin_file_" + $(this).prev().attr('value')).hide();
-      });
-
+      var get_html = function(old_id,new_id){
+        return ("<%= escape_javascript(add_attribute 'form_file', f, :writing_conference_files) %>").replace(old_id, new_id);
+      }
     </script>
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/edit.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/edit.html.erb
index 860d2ef4..0300177c 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/edit.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/edit.html.erb
@@ -1,4 +1,4 @@
-<%= form_for @writing_conference, html: { multipart: true, "form-type"=>"ajax_form", "callback-method"=>"formCallback"}, url: panel_personal_conference_desktop_conference_page_path(@writing_conference) do |f| %>
+<%= form_for @writing_conference, html: { multipart: true, "form-type"=>"ajax_form", "callback-method"=>"coAuthorformCallback"}, url: panel_personal_conference_desktop_conference_page_path(@writing_conference) do |f| %>
   <%= render partial: 'form', locals: {:f => f} %>
 <%end%>
 
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/new.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/new.html.erb
index 4577fec0..0a2f8081 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/new.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/new.html.erb
@@ -1,4 +1,4 @@
-<%= form_for @writing_conference, html: { multipart: true, "form-type"=>"ajax_form", "callback-method"=>"formCallback"},  url: panel_personal_conference_desktop_conference_pages_path  do |f| %>
+<%= form_for @writing_conference, html: { multipart: true, "form-type"=>"ajax_form", "callback-method"=>"coAuthorformCallback"},  url: panel_personal_conference_desktop_conference_pages_path  do |f| %>
   <%= render partial: 'form', locals: {:f => f} %>
 <%end%>
 
diff --git a/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js b/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js
index c76885f5..fd0a6acd 100644
--- a/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js
+++ b/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js
@@ -36,6 +36,11 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ //
           o.notify(data.msg,"success");
         }
     }
+
+    this.initializeJournalPapers.editpaper = function(){
+      o.highlight_sub_menu_item(1)
+    }
+
     this.initializeJournalPapers.addpaper = function(){ // to open add pages in journal papers page
       var bindHandlers = function(){ // to bind handlers for add page
         o.simple_drop_down();
@@ -52,10 +57,10 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ //
           return false;
         });
 
-  $('.action a.remove_existing_record').click(function(){
-    $(this).next('.should_destroy').attr('value', 1);
-    $("tr#add_plugin_file_" + $(this).prev().attr('value')).hide();
-  });
+         $('.action a.remove_existing_record').click(function(){
+           $(this).next('.should_destroy').attr('value', 1);
+           $("tr#add_plugin_file_" + $(this).prev().attr('value')).hide();
+         });
       }
       bindHandlers();
     }
@@ -63,7 +68,6 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ //
     this.initializeJournalPapers.journal = function(){ // to open add pages in journal papers page
       var bindHandlers = function(){ // to bind handlers for add page
         o.simple_drop_down();
-        
       }
       bindHandlers();
     }
@@ -71,7 +75,7 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ //
     this.initializeJournalPapers.coAuthorformCallback = function(data){
         if(data.success){
           o.notify(data.msg,"success");
-          o.sub_menu_item($("div[content-type=menu] a").eq(0));
+          o.sub_menu_item($("div[content-type=menu] a").eq(3));
         }else{
           o.notify(data.msg,"alert");
         }
diff --git a/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb b/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb
index 291f7fe9..75f7bd6a 100644
--- a/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb
+++ b/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb
@@ -50,6 +50,7 @@ module Panel::PersonalJournal::Desktop::JournalPagesHelper
       content_tag(:a, t("edit"),
        :class => "journal_paper_edit admbg2 admtxt",
        :href => edit_panel_personal_journal_desktop_journal_page_path(publication),
+       "callback-method" => "editpaper",
        "ajax-remote" => "get") + \
       content_tag(:a, t("delete"),
         "ajax-remote" => "delete",
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/edit.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/edit.html.erb
index 179790d0..fd1718df 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/edit.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/edit.html.erb
@@ -1,3 +1,3 @@
 <%= form_for @journal_co_author, html: { multipart: true ,"form-type"=>"ajax_form", "callback-method"=>"coAuthorformCallback"} , url: panel_personal_journal_desktop_journal_co_author_path(@journal_co_author) do |f| %>
-  <%= render partial: 'panel/personal_journal/desktop/journal_co_authors/form', locals: {:f => f} %>
+  <%= render partial: 'form', locals: {:f => f} %>
 <% end %>
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/new.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/new.html.erb
index 4d7edb1b..52409fe1 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/new.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/new.html.erb
@@ -1,3 +1,3 @@
-<%= form_for @journal_co_author, html: { multipart: true ,"form-type"=>"ajax_form", "callback-method"=>"journalCoAuthorformCallback"} , url: panel_personal_journal_desktop_journal_co_authors_path do |f| %>
-  <%= render partial: 'panel/personal_journal/desktop/journal_co_authors/form', locals: {:f => f} %>
+<%= form_for @journal_co_author, html: { multipart: true ,"form-type"=>"ajax_form", "callback-method"=>"coAuthorformCallback"} , url: panel_personal_journal_desktop_journal_co_authors_path do |f| %>
+  <%= render partial: 'form', locals: {:f => f} %>
 <% end %>
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
index ce8040cf..eb5354e3 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
@@ -227,6 +227,19 @@
   </div>
 </div>
 
+    <script>
+      $(document).ready(function(){
+          $("#writing_conference_author_tokens").tokenInput("/panel/personal_conference/desktop/conference_pages/new.json", {
+            crossDomain: false,
+            prePopulate: $("#writing_conference_author_tokens").data("pre"),
+            theme: "facebook",
+            hintText: "<%=t("hintText")%>",
+            noResultsText: "<%=t("noResultsText")%>",
+            searchingText: "<%=t("searchingText")%>"
+          });
+      });
+    </script>
+
 <script type="text/javascript">
   orbitDesktop.prototype.initializeJournalPapers.journal_title_autocomplete_list = <%= @journal_candidate.to_json.html_safe   %>; 
   //  orbitDesktop.prototype.initializeJournalPapers.coauthor_autocomplete_list = <%= @co_author_candidate.to_json.html_safe  %>;
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/edit.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/edit.html.erb
index 3811274a..26b504c1 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/edit.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/edit.html.erb
@@ -1,3 +1,3 @@
-<%= form_for @writing_journal, html: { multipart: true, "form-type"=>"ajax_form", "callback-method"=>"formCallback"}, url: panel_personal_journal_desktop_journal_page_path(@writing_journal) do |f| %>
-  <%= render partial: 'panel/personal_journal/desktop/journal_pages/form', locals: {:f => f} %>
+<%= form_for @writing_journal, html: { multipart: true, "form-type"=>"ajax_form", "callback-method"=>"addpaper"}, url: panel_personal_journal_desktop_journal_page_path(@writing_journal) do |f| %>
+  <%= render partial: 'form', locals: {:f => f} %>
 <%end%>