diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js
index 744654776..047847ca7 100755
--- a/app/assets/javascripts/orbitdesktop.js
+++ b/app/assets/javascripts/orbitdesktop.js
@@ -164,13 +164,16 @@ var orbitDesktop = function(dom){
       var $e = $(this);
       var t = $e.attr("ajax-remote");
       var classes_to_toggle = $e.attr("toggle-onclick");
+      var exe = $e.attr("callback-method"); // (typeof $e.attr("callback-method") == "function"? $e.attr("callback-method") : "");
       if(classes_to_toggle){
           $e.toggleClass(classes_to_toggle);
         }
       if(t == "false"){
+        if(exe){
+          window.o[o.data_method][exe](null,$e);
+        }
         return false;
       }
-      var exe = $e.attr("callback-method"); // (typeof $e.attr("callback-method") == "function"? $e.attr("callback-method") : "");
       var ca = $e.attr("content-holder");
       var a = function(){
 
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 608eee5b6..c0ce56af7 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
@@ -1,8 +1,9 @@
 <div class="toolbar hh1">
   <div class="fn_g hp">
-    <%= f.submit t("save"), name: "commit", class: "fn_btn ini_input hp hh1 thmc2 thmtxt" %>
+    <%= f.submit t("save"), name: "commit", value: "Save", class: "fn_btn ini_input hp hh1 thmc2 thmtxt" %>
+    <!-- class: bt-cancle can't be remove -->
     <% if not @writing_conference.new_record? %>
-      <%= submit_tag t("cancel"), :type => "button", "ajax-remote" => "get", :href => panel_personal_conference_desktop_conference_pages_path, class: "ini_input hp hh1 thmadm thmtxt" %>
+      <%= submit_tag t("cancel"), :type => "button", "ajax-remote" => "get", :href => panel_personal_conference_desktop_conference_pages_path, class: "bt-cancel ini_input hp hh1 thmadm thmtxt" %>
     <% end %>
   </div>
   <div class="hh1 hp sdm">
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 fd0a6acd0..0157b4e7c 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
@@ -57,10 +57,12 @@ 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();
     }
@@ -102,4 +104,14 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ //
         o.notify(data.msg,"alert");
     }
   }
+   this.initializeJournalPapers.allnone = function(d,o){
+    switch(o.attr("href")){
+      case "all":
+        $("div.overview a.icon-check-empty").removeClass("icon-check-empty").addClass("icon-check");
+      break;
+      case "none":
+        $("div.overview a.icon-check").removeClass("icon-check").addClass("icon-check-empty");
+      break;
+    }
+   }
 };
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 497bae714..a4d40d640 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
@@ -1,8 +1,10 @@
 <div class="toolbar hh1">
   <div class="fn_g hp">
-    <%= f.submit t("save"), name: "commit", class: "fn_btn ini_input hp hh1 thmc2 thmtxt" %>
+
+    <%= f.submit "Save", name: "commit", value: "Save", class: "fn_btn ini_input hp hh1 thmc2 thmtxt" %>
     <% if not @writing_journal.new_record? %>
-      <%= submit_tag t("cancel"), :type => "button", "ajax-remote" => "get", :href => panel_personal_journal_desktop_journal_pages_path, class: "ini_input hp hh1 thmadm thmtxt" %>
+      <%= submit_tag "Cancel", :type => "button", "ajax-remote" => "get", :href => panel_personal_journal_desktop_journal_pages_path, class: "ini_input hp hh1 thmadm thmtxt" %>
+
     <% end %>
   </div>
   <div class="hh1 hp sdm">
@@ -188,7 +190,12 @@
                 <td colspan="3">
                   <div id='add_plugin_file' class="info_input plugin_files_block s_action">
                     <%= hidden_field_tag 'plugin_file_field_count', @writing_journal.writing_journal_files.count %>
+<<<<<<< Updated upstream
                     <a class="add setting_btn thmc1 thmtxt w1 hh1 hp" href=""><i class="icon-plus icon-white"></i> add</a>
+=======
+                    <a class="add setting_btn thmc1 thmtxt w1 hh2 hp" href="#"><i class="icon-plus icon-white"></i> add</a>
+
+>>>>>>> Stashed changes
                   </div>
                 </td>
               </tr>
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
index d82ff4f08..4a78a5060 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
@@ -3,8 +3,8 @@
     <div class="sdm_t hh1"><span class="icon-check"></span></div>
     <div class="admbg sdm_o">
       <ul id="journal_selection_options">
-        <li><a class="hp hh1 admtxt" href="all">All</a></li>
-        <li><a class="hp hh1 admtxt" href="none">None</a></li>
+        <li><a class="hp hh1 admtxt" href="all" ajax-remote="false" callback-method="allnone">All</a></li>
+        <li><a class="hp hh1 admtxt" href="none" ajax-remote="false" callback-method="allnone">None</a></li>
       </ul>
     </div>
   </div>