diff --git a/app/assets/images/desktop/personal_lab.svg b/app/assets/images/desktop/personal_lab.svg
new file mode 100644
index 0000000..e69de29
diff --git a/app/controllers/admin/labs_controller.rb b/app/controllers/admin/labs_controller.rb
index 7f209bc..878c93c 100644
--- a/app/controllers/admin/labs_controller.rb
+++ b/app/controllers/admin/labs_controller.rb
@@ -1,4 +1,5 @@
 class Admin::LabsController < OrbitMemberController
+  include Admin::PersonalLabsHelper
   layout "member_plugin"
 
   before_action :set_lab, only: [:show, :edit , :update, :destroy]
@@ -15,28 +16,48 @@ class Admin::LabsController < OrbitMemberController
   def new
     @member = MemberProfile.find_by(:uid=>params['uid']) rescue nil
     @lab = Lab.new
+    if params[:desktop]
+      render :layout => false
+    end
   end
 
   def create
     @member = MemberProfile.find(lab_params['member_profile_id']) rescue nil
     @lab = Lab.new(lab_params)
     @lab.save
-    redirect_to params['referer_url']
+    if params[:desktop] == "true"
+      render json: {"data" => get_paper_list}.to_json
+    else
+      redirect_to params['referer_url']
+    end
   end
 
   def edit
     @member = @lab.member_profile rescue nil
+    if params[:desktop]
+      render :layout => false
+    end
   end
 
   def update
     @member = @lab.member_profile rescue nil
     @lab.update_attributes(lab_params)
     @lab.save
-    redirect_to params['referer_url']
+    if params[:desktop] == "true"
+      render json: {"data" => get_paper_list}.to_json
+    else
+      redirect_to params['referer_url']
+    end
   end
 
   def destroy
     @lab.destroy
+    respond_to do |format|
+      format.html { redirect_to(admin_labs_url) }
+      # format.xml { head :ok }
+      format.js
+      format.json {render json: {"success" => true}}
+      end
   end
 
   def toggle_hide
diff --git a/app/controllers/desktop/personal_labs_controller.rb b/app/controllers/desktop/personal_labs_controller.rb
new file mode 100644
index 0000000..f3bbe89
--- /dev/null
+++ b/app/controllers/desktop/personal_labs_controller.rb
@@ -0,0 +1,23 @@
+class Desktop::PersonalLabsController < DesktopAdminController
+	include Admin::PersonalLabsHelper
+
+	def menu
+		user = OrbitHelper.current_user
+		[
+			{
+				"title" => "List",
+				"layout" => "list"
+			},
+			{
+				"title" => "Add/Edit",
+				"layout" => "form",
+				"new_path" => "/admin/members/#{user.member_profile.to_param}/labs/new"
+			}
+		]
+	end
+
+	def list
+		get_paper_list
+	end
+
+end
\ No newline at end of file
diff --git a/app/helpers/admin/personal_labs_helper.rb b/app/helpers/admin/personal_labs_helper.rb
new file mode 100644
index 0000000..a4fd25f
--- /dev/null
+++ b/app/helpers/admin/personal_labs_helper.rb
@@ -0,0 +1,27 @@
+module Admin::PersonalLabsHelper
+
+	def get_paper_list
+		user = current_user.nil? ? OrbitHelper.current_user : current_user
+	  user_profile = user.member_profile
+	  labs = Lab.where(:member_profile_id => user_profile.id)
+	  labs = labs.collect do |l|
+	      files = l.lab_files.collect do |lf|
+	          {
+	              "title" => lf.title,
+	              "description" => lf.description,
+	              "link" => lf.file.url,
+	              "extension" => (lf.file.url.split(".").last rescue "")
+	          }
+	      end
+	      {
+	          "id" => l.id.to_s,
+	          "edit_url" => "/#{I18n.locale.to_s}/admin/members/#{user_profile.to_param}/labs/#{l.to_param}/edit",
+	          "delete_url" => "/#{I18n.locale.to_s}/admin/labs/#{l.id.to_s}",
+	          "paper_title" => l.lab_title,
+	          "keywords" => l.keywords,
+	          "files" => files
+	      }
+	  end
+	  labs
+	end
+end
\ No newline at end of file
diff --git a/app/views/admin/labs/_form.html.erb b/app/views/admin/labs/_form.html.erb
index 9647526..e05e98f 100644
--- a/app/views/admin/labs/_form.html.erb
+++ b/app/views/admin/labs/_form.html.erb
@@ -5,7 +5,7 @@
   <%= stylesheet_link_tag "lib/main-list" %>
 <% end %>
 <% content_for :page_specific_javascript do %>
-  <%= javascript_include_tag "lib/bootstrap-fileupload" %> 
+  <%= javascript_include_tag "lib/bootstrap-fileupload" %>
   <%= javascript_include_tag "lib/file-type" %>
   <%= javascript_include_tag "lib/module-area" %>
 <% end %>
@@ -13,7 +13,7 @@
 <!-- Input Area -->
 <div class="input-area">
 
-  <!-- Module Tabs --> 
+  <!-- Module Tabs -->
   <div class="nav-name"><strong><%= t(:module) %></strong></div>
   <ul class="nav nav-pills module-nav">
     <li></li>
@@ -30,14 +30,14 @@
 
     <!-- Basic Module -->
     <div class="tab-pane fade in active" id="basic">
-      
+
       <div class="control-group">
         <label class="control-label muted"><%= t("personal_plugins.author") %></label>
         <div class="controls">
           <%= @member.name rescue ''%>
           <%= f.hidden_field :member_profile_id, :value => @member.id if !@member.nil?  %>
         </div>
-      </div> 
+      </div>
 
       <!-- year -->
       <div class="control-group">
@@ -45,7 +45,7 @@
         <div class="controls">
           <%= select_year((@lab.year ? @lab.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'lab[year]', :class => 'span1'} ) %>
         </div>
-      </div> 
+      </div>
 
       <!-- extension_no -->
       <div class="control-group">
@@ -61,7 +61,7 @@
         <div class="controls">
           <%= f.text_field :research_direction %>
         </div>
-      </div> 
+      </div>
 
       <!-- facility -->
       <div class="control-group">
@@ -69,7 +69,7 @@
         <div class="controls">
           <%= f.text_field :facility %>
         </div>
-      </div>  
+      </div>
 
       <!-- url -->
       <div class="control-group">
@@ -77,7 +77,7 @@
         <div class="controls">
           <%= f.text_field :url , :class => "span6" %>
         </div>
-      </div> 
+      </div>
 
       <!-- keywords -->
       <div class="control-group">
@@ -85,7 +85,7 @@
         <div class="controls">
           <%= f.text_field :keywords %>
         </div>
-      </div> 
+      </div>
 
       <!-- note -->
       <div class="control-group">
@@ -93,7 +93,7 @@
         <div class="controls">
           <%= f.text_area :note, rows: 2, class: "input-block-level" %>
         </div>
-      </div> 
+      </div>
 
     </div>
 
@@ -125,13 +125,13 @@
   <div class="tab-content language-area">
 
     <% @site_in_use_locales.each_with_index do |locale, i| %>
-    
+
       <div class="<%= locale %> tab-pane fade <%= ( i == 0 ) ? "in active" : '' %>">
 
         <!-- lab_title-->
         <div class="control-group input-title">
           <label class="control-label muted"><%= t("personal_lab.lab_title") %></label>
-          <div class="controls">            
+          <div class="controls">
             <%= f.fields_for :lab_title_translations do |f| %>
               <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_lab.lab_title"), value: (@lab.lab_title_translations[locale] rescue nil) %>
             <% end %>
@@ -141,7 +141,7 @@
         <!-- location-->
         <div class="control-group input-title">
           <label class="control-label muted"><%= t("personal_lab.location") %></label>
-          <div class="controls">            
+          <div class="controls">
             <%= f.fields_for :location_translations do |f| %>
               <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_lab.location"), value: (@lab.location_translations[locale] rescue nil) %>
             <% end %>
@@ -151,7 +151,7 @@
         <!-- participating_professor-->
         <div class="control-group input-title">
           <label class="control-label muted"><%= t("personal_lab.participating_professor") %></label>
-          <div class="controls">            
+          <div class="controls">
             <%= f.fields_for :participating_professor_translations do |f| %>
               <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_lab.participating_professor"), value: (@lab.participating_professor_translations[locale] rescue nil) %>
             <% end %>
@@ -161,7 +161,7 @@
         <!-- participating_student-->
         <div class="control-group input-title">
           <label class="control-label muted"><%= t("personal_lab.participating_student") %></label>
-          <div class="controls">            
+          <div class="controls">
             <%= f.fields_for :participating_student_translations do |f| %>
               <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_lab.participating_student"), value: (@lab.participating_student_translations[locale] rescue nil) %>
             <% end %>
@@ -184,11 +184,11 @@
               <%= f.fields_for :lab_files, lab_file do |f| %>
                 <%= render :partial => 'form_file', :object => lab_file, :locals => {:f => f, :i => i} %>
               <% end %>
-            <% end %> 
+            <% end %>
             <hr>
           </div>
         <% end %>
-        
+
         <!-- Add -->
         <div class="add-target">
         </div>
@@ -207,34 +207,29 @@
   <%= f.hidden_field :user_id, :value => params[:user_id] if !params[:user_id].blank? %>
   <input type="hidden" name="referer_url" value="<%= request.referer %>">
   <%= f.submit t('submit'), class: 'btn btn-primary' %>
-  <%= link_to t('cancel'), get_go_back, :class=>"btn" %>  
+  <%= link_to t('cancel'), get_go_back, :class=>"btn" %>
 </div>
 
-<% content_for :page_specific_javascript do %>
-  <script>
-    $(document).ready(function() {
-      $('.main-forms .add-on').tooltip();
-      $(document).on('click', '#add_file', function(){
-        var new_id = $(this).prev().attr('value');
-        var old_id = new RegExp("new_lab_files", "g");
-        var on = $('.language-nav li.active').index();
-        var le = $(this).parent('.add-btn').prev('.add-target').children('.start-line').length;
-        $(this).prev().attr('value', parseInt(new_id) + 1);
-        $(this).parent().siblings('.add-target').append(("<%= escape_javascript(add_attribute 'form_file', f, :lab_files) %>").replace(old_id, new_id));  
-        $(this).parent('.add-btn').prev('.add-target').children('.start-line').eq(le).children('.input-append').find('.tab-content').each(function() {
-          $(this).children('.tab-pane').eq(on).addClass('in active').siblings().removeClass('in active');
-        });
-        formTip();
-      }); 
-      $(document).on('click', '.delete_file', function(){
-        $(this).parents('.input-prepend').remove();
+<script>
+  $('.main-forms').find('.add-on').tooltip().end().on('click', '.trigger, .delete_file, .remove_existing_record', function() {
+    if($(this).hasClass('trigger')) {
+      var new_id = $(this).prev().attr('value');
+      var old_id = new RegExp("new_lab_files", "g");
+      var on = $('.language-nav li.active').index();
+      var le = $(this).parent('.add-btn').prev('.add-target').children('.start-line').length;
+      $(this).prev().attr('value', parseInt(new_id) + 1);
+      $(this).parent().siblings('.add-target').append(("<%= escape_javascript(add_attribute 'form_file', f, :lab_files) %>").replace(old_id, new_id));
+      $(this).parent('.add-btn').prev('.add-target').children('.start-line').eq(le).children('.input-append').find('.tab-content').each(function() {
+        $(this).children('.tab-pane').eq(on).addClass('in active').siblings().removeClass('in active');
       });
-      $(document).on('click', '.remove_existing_record', function(){
-        if(confirm("<%= I18n.t(:sure?)%>")){
-          $(this).children('.should_destroy').attr('value', 1);
-          $(this).parents('.start-line').hide();
-        }
-      });
-    });
-  </script>
-<% end %>
\ No newline at end of file
+      $('.add-on').tooltip();
+    } else if($(this).hasClass('delete_file')) {
+      $(this).parents('.input-prepend').remove();
+    } else if($(this).hasClass('remove_existing_record')) {
+      if(confirm("<%= I18n.t(:sure?)%>")){
+        $(this).children('.should_destroy').attr('value', 1);
+        $(this).parents('.start-line').hide();
+      }
+    }
+  });
+</script>
\ No newline at end of file
diff --git a/lib/personal_lab/engine.rb b/lib/personal_lab/engine.rb
index d3d237b..055b9fc 100644
--- a/lib/personal_lab/engine.rb
+++ b/lib/personal_lab/engine.rb
@@ -7,6 +7,7 @@ module PersonalLab
 			personal_plugin :enable => true, :sort_number => '30', :app_name=>"Lab", :intro_app_name=>"PersonalLabIntro",:path=>"/plugin/personal_lab/profile",:front_path=>"/profile",:admin_path=>"/admin/labs",:i18n=>'module_name.personal_lab', :module_app_name=>'PersonalLab'
 
 			version "0.1"
+			desktop_enabled true
 			organization "Rulingcom"
 			author "RD dep"
 			intro "I am intro"