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 f73b5eba4..e457758f8 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,9 +1,8 @@
 <div class="toolbar hh1">
   <div class="fn_g hp">
-    <%= f.submit t("save"), name: "commit", value: "Save", class: "fn_btn ini_input hp hh1 thmc2 thmtxt" %>
-    <!-- class: bt-cancle can't be remove -->
+    <%= f.submit t("save"), name: "commit", class: "fn_btn ini_input hp hh1 thmc2 thmtxt" %>
     <% if not @writing_conference.new_record? %>
-      <%= 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" %>
+      <%= submit_tag t("cancel"), :type => "button", "ajax-remote" => "get", :href => panel_personal_conference_desktop_conference_pages_path, class: "ini_input hp hh1 thmadm thmtxt" %>
     <% end %>
   </div>
   <div class="hh1 hp sdm">
@@ -156,6 +155,7 @@
           </ul>
         </div>
       </div>
+<<<<<<< HEAD
       <div column="true">
         <div class="s_form">
           <ul>
@@ -183,6 +183,33 @@
                   <%= f.fields_for :writing_conference_files, writing_conference_file do |f| %>
                     <%= render :partial => 'form_file', :object => writing_conference_file, :locals => {:f => f, :i => i} %>
                   <% end %>
+=======
+      <div class="s_grid_con s_form">
+        <ul>
+          <li class="s_grid_row">
+          <table class="s_table">
+            <thead>
+              <tr>
+                <th class="s_grid_2"><%= t("personal_conference.file")%></th>
+                <th class="s_grid_3"><%= t("personal_conference.file_name")%></th>
+                <th class="s_grid_1"><%= t("personal_conference.description") %></th>
+              </tr>
+            </thead>
+            <tfoot>
+              <tr>
+                <td colspan="3">
+                  <div id='add_plugin_file' class="info_input plugin_files_block s_action">
+                    <%= hidden_field_tag 'plugin_file_field_count', @writing_conference.writing_conference_files.count %>
+                    <a class="add setting_btn thmc1 thmtxt w1 hh1 hp" href=""><i class="icon-plus icon-white"></i> add</a>
+                  </div>
+                </td>
+              </tr>
+            </tfoot>
+            <tbody>
+              <% @writing_conference.writing_conference_files.each_with_index do |writing_conference_file, i| %>
+                <%= f.fields_for :writing_conference_files, writing_conference_file do |f| %>
+                  <%= render :partial => 'form_file', :object => writing_conference_file, :locals => {:f => f, :i => i} %>
+>>>>>>> desktop CSS update
                 <% end %>
               </tbody>
             </table>
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 76a9f5f10..e3ad93648 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,8 @@
 <div class="toolbar hh1">
   <div class="fn_g hp">
-    <%= f.submit "Save", name: "commit", value: "Save", 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" %>
     <% if not @writing_journal.new_record? %>
-      <%= submit_tag "Cancel", :type => "button", "ajax-remote" => "get", :href => panel_personal_journal_desktop_journal_pages_path, class: "ini_input hp hh1 thmadm thmtxt" %>
+      <%= submit_tag t("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">