diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js
index ab98d833..8ad2694d 100755
--- a/app/assets/javascripts/orbitdesktop.js
+++ b/app/assets/javascripts/orbitdesktop.js
@@ -1,9 +1,7 @@
+
 // JavaScript Document
 //harry
 //Inititialize function will initialize desktop
-
-
-
 $.extend($.expr[':'], {
 	'containsi': function (elem, i, match, array) {
 		return (elem.textContent || elem.innerText || '').toLowerCase().indexOf((match[3] || "").toLowerCase()) >= 0;
@@ -25,7 +23,6 @@ var orbitDesktop = function(dom){
 	this.contentHolder = dom;
 	this.themesettings = "";
 	this.theme = "4f8d3f493b67fcd05f086359";
-//	this.themefolder = "themes";
 	this.transitionTime = 500;
 	this.currenthtml = "desktop.html";
 	this.currentface = "home";
@@ -137,11 +134,11 @@ var orbitDesktop = function(dom){
 		o.currentface = "home";
 	
 		var bindHandlers = function(){ // this function will bind all the handlers in the desktop
-
 			var groupWrapperWidth = 0;
 			$("div#desktop .group").each(function(){groupWrapperWidth+=$(this).outerWidth(true);});
 
 			$("div#desktop #group_wrapper").css("width",groupWrapperWidth);
+			var first = true;
 			$("div#desktop .g_col").sortable({
 				connectWith: ".g_col",
 				tolerance: 'pointer' ,
@@ -149,37 +146,37 @@ var orbitDesktop = function(dom){
 				containment: '#group_wrapper',
 				helper: 'clone',
 				stop:function(){
-					var newpostitions = new Array;
-					var groupids = new Array;
-					$.each($("div#desktop .group"),function(i,grp){
-						var groupone = new Array;
-						groupids.push($(grp).attr("id"));
-						$ul = $(grp).find(".g_col .element");
-						$.each($ul,function(){
-							groupone.push($(this).attr("id"));
-						})
-						newpostitions.push(groupone);
-					});
-					$.post("/desktop/newpositions",{"sectionid":o.sectionId,"newpos":newpostitions,"groupids":groupids});
+					first = true;
 				},
 				update:function(){
+					if(first){
+						first = false;
+						var newpostitions = new Array;
+						var groupids = new Array;
+						$.each($("div#desktop .group"),function(i,grp){
+							var groupone = new Array;
+							groupids.push($(grp).attr("id"));
+							$ul = $(grp).find(".g_col .element");
+							$.each($ul,function(){
+								groupone.push($(this).attr("id"));
+							})
+							newpostitions.push(groupone);
+						});
+						$.post("/desktop/newpositions",{"sectionid":o.sectionId,"newpos":newpostitions,"groupids":groupids});
+					}
 					var s = $(this).find('.element').length;
 						if(s!=0){
 							last = $(this).find('.element').eq(s-1).position(),
 							lasth = $(this).find('.element').eq(s-1).outerHeight(true);
-					
 							if ((last.top+lasth)>528){
 								$(this).sortable('cancel');
 							}
 						}else{$(this).remove();}
-
 				},
 				receive: function(event, ui){
-				
 					var s = $(this).find('.element').length,
 						last = $(this).find('.element').eq(s-1).position(),
 						lasth = $(this).find('.element').eq(s-1).outerHeight(true);
-
 					if ((last.top+lasth)>528){
 						$(ui.sender).sortable('cancel');
 					}
@@ -228,12 +225,12 @@ var orbitDesktop = function(dom){
 							bw = parseInt(brick[0].substr(1)),
 							bh = parseInt(brick[1].substr(1)),
 							bd = bw * bh;
-							
 						if(bh==1 && bw==1){
 							small++;
 						}else if(bh!=1 && bw!=1){
 							single = true;
-						}
+						}		
+					
 						if(small==2){
 							small=0;
 							single=false;
@@ -755,15 +752,52 @@ var orbitDesktop = function(dom){
 		
 		var connection = function(){
 			var bindHandlers = function(){
-				$("#gmail_connect_btn").click(function(){
-						var usernm = $("input#gmail_username").val(),
-							pwd = $("input#gmail_password").val(),
-							type = $(this).attr("href"),
-							what = "edit";
-						if(usernm!="" && pwd!="")
-							saveaccount(usernm,pwd,type,what);
-							
-				});
+				$("#connection_setting ul a").click(function(){
+					var what = $(this).attr("for"),
+						type = $(this).attr("href"),
+						$ul = $("#"+type+"_connection"),
+						usernm = $ul.find("input[type=text]").val(),
+						pwd = $ul.find("input[type=password]").val();
+						switch(what){
+							case "save":
+							case "new":
+								if(usernm!="" && pwd!=""){
+									$ul.find("input[type=text]").replaceWith("<div class='c_info usrnm'>"+usernm+"</div>")
+									$ul.find("input[type=password]").replaceWith("<div class='c_info pwd'>&#8226;&#8226;&#8226;&#8226;&#8226;&#8226;</div>");
+									$(this).text("Edit").attr("for","edit");
+									$(this).parent().find("a[for=delete]").show();
+									$ul.find("span.c_status").text("Connected").addClass("c_status_on");
+									if(what=="save")
+										what="edit";
+									saveaccount(usernm,pwd,type,what);
+								}
+								break;
+							case "edit":
+								var un = $ul.find("div.usrnm").text();
+								$ul.find("div.usrnm").replaceWith('<input type="text" value="'+un+'">');
+								$ul.find("div.pwd").replaceWith('<input type="password">');
+								$(this).text("Save").attr("for","save");
+								break;
+							case "delete":
+							var $this = $(this);
+								o.confirm({
+									message : "Are you sure that you want to remove this account?",
+									buttons : ["Yes","No"],
+									highlighted : 2
+								},function(reply){
+									if(reply){
+										$this.hide();
+										$ul.find("div.usrnm").replaceWith('<input type="text">');
+										$ul.find("div.pwd").replaceWith('<input type="password">');
+										$ul.find("span.c_status").text("No Connection").removeClass("c_status_on");
+										$this.parent().find("a[for=edit]").text("Connect").attr("for","new");
+										saveaccount("","",type,what);
+									}
+								})
+								break;
+						}
+						
+				})
 
 				var $conlist = $('.s_form'),
 					conlist_w = $conlist.length * $conlist.outerWidth(true) + ($conlist.length - 1) * 25;
@@ -779,14 +813,32 @@ var orbitDesktop = function(dom){
 			}
 			var saveaccount = function(usernm,pwd,type,what){
 					$.post("/desktop/save_account_info",{email:usernm,password:pwd,account:type,dowhat:what},function(result){
-						if(result[0].success=="true")
-							o.notify("Gmail account connected!!","success",2);
-						else
-							o.notify("Gmail account connection failed!!","imp",2);
+						if(what!="delete"){
+							if(result[0].success=="true")
+								o.notify(type+" account connected!!","success",2);
+							else
+								o.notify(type+" account connection failed!!","imp",2);
+						}else{
+							if(result[0].success=="true")
+								o.notify(type+" account removed!!","success",2);
+							else
+								o.notify(type+" account removal failed!!","imp",2);
+						}
 					})
 			}
 			$("div#settings div#panel_r").load("/desktop/settingconnection",function(){
-				bindHandlers();
+				$.getJSON("desktop/getaccounts",function(accounts){
+					$.each(accounts,function(i,account){
+						$ul = $("#"+account.type+"_connection");
+						$ul.find("input[type=text]").replaceWith("<div class='c_info usrnm'>"+account.email+"</div>")
+						$ul.find("input[type=password]").replaceWith("<div class='c_info pwd'>&#8226;&#8226;&#8226;&#8226;&#8226;&#8226;</div>");
+						$ul.find("a[for=new]").text("Edit").attr("for","edit");
+						$ul.find("a[for=delete]").show();
+						$ul.find("span.c_status").text("Connected").addClass("c_status_on");
+					})
+					bindHandlers();
+				})
+				
 			})
 			
 		}
@@ -940,4 +992,3 @@ orbitDesktop.prototype.currentUsername = "Harry";
 var uselessfunction = function(){
 	$.post("/desktop/temp_func",{sectionid:"4f83e7bbbd98eb041600001d"});
 }
-
diff --git a/app/controllers/otheraccounts_controller.rb b/app/controllers/otheraccounts_controller.rb
index a9e9b858..65a9b5a4 100644
--- a/app/controllers/otheraccounts_controller.rb
+++ b/app/controllers/otheraccounts_controller.rb
@@ -14,8 +14,11 @@ class OtheraccountsController< ApplicationController
     when "new"
       OtherAccount.create(user_id: current_user.id, email: @email, encrypted_password: @password, type: @account)
     when "edit"
-      @otheraccount = OtherAccount.where(:type.all => [@account],:user_id.all => [current_user.id])
+      @otheraccount = OtherAccount.where(:type.all => [@account],:user_id.all => [current_user.id]) rescue nil
       @otheraccount.first.update_attributes(:email => @email, :encrypted_password => @password)
+    when "delete"
+      @otheraccount = OtherAccount.where(:type.all => [@account], :user_id.all => [current_user.id]) rescue nil
+      @otheraccount.destroy_all
     end
     a = Array.new
     a << {"success"=>"true"}
@@ -23,19 +26,31 @@ class OtheraccountsController< ApplicationController
   end
 
   def gmail
-    @gmailaccount = OtherAccount.where(:type.all => ["gmail"],:user_id.all => [current_user.id])
-    @decrypted_password = @gmailaccount.first.encrypted_password.decrypt 
-    @email = @gmailaccount.first.email
-    url = URI.parse("https://mail.google.com/mail/feed/atom")
-    req = Net::HTTP::Get.new(url.path)
-    req.basic_auth @email, @decrypted_password
-    req.content_type = 'text/xml'
+    @gmailaccount = OtherAccount.where(:type.all => ["gmail"],:user_id.all => [current_user.id]) rescue nil
+    if @gmailaccount.first != nil
+      @decrypted_password = @gmailaccount.first.encrypted_password.decrypt 
+      @email = @gmailaccount.first.email
+      url = URI.parse("https://mail.google.com/mail/feed/atom")
+      req = Net::HTTP::Get.new(url.path)
+      req.basic_auth @email, @decrypted_password
+      req.content_type = 'text/xml'
 
-    http = Net::HTTP.new(url.host, url.port)
-    http.use_ssl = true
-    response = http.start { |http| http.request(req) }
+      http = Net::HTTP.new(url.host, url.port)
+      http.use_ssl = true
+      response = http.start { |http| http.request(req) }
 
-    root = Document.new(response.read_body).root
-    render :text=>root
+      root = Document.new(response.read_body).root
+      render :text=>root
+    else
+      msg = "<HEAD><ERROR>true</ERROR><ERRORMSG>Account setting problem.</ERRORMSG></HEAD>"
+      respond_to do |m|
+        m.xml {render :xml=>msg}
+      end
+    end
+  end
+
+  def getaccounts
+    @accounts = OtherAccount.where(:user_id.all => [current_user.id])
+    render :json => @accounts.to_json
   end
 end
\ No newline at end of file
diff --git a/app/views/desktop/settings/connections.html.erb b/app/views/desktop/settings/connections.html.erb
index 3619a583..fd49915a 100644
--- a/app/views/desktop/settings/connections.html.erb
+++ b/app/views/desktop/settings/connections.html.erb
@@ -27,37 +27,39 @@
 					<td><label for="s_name1">Password</label><input type="password" /></td>
 				</tr>
 			</table> -->
-			<ul class="s_form w2 hp">
+			<ul class="s_form w2 hp" id="facebook_connection">
 				<li><span class="c_status">No Connection</span></li>
 				<li><img src="assets/connection/facebook.png" alt="" class="c_icon"><h1 class="c_name">Facebook</h1></li>
 				<li><label for="">Account</label><input type="text"></li>
 				<li><label for="">Password</label><input type="password"></li>
 				<li>
 					<div class="s_action">
-						<a href="" class="setting_btn thmc1 thmtxt hp disable">Connecting</a>
+						<a href="facebook" class="setting_btn thmc1 thmtxt hp" onclick="return false;" for="new">Connect</a>
+						<a href="facebook" class="setting_btn thmc1 thmtxt hp" onclick="return false;" for="delete" style="display:none;">Remove</a>
 					</div>
 				</li>
 			</ul>
-			<ul class="s_form w2 hp">
-				<li><spanspan class="c_status">No Connection</span></li>
+			<ul class="s_form w2 hp" id="twitter_connection">
+				<li><span class="c_status">No Connection</span></li>
 				<li><img src="assets/connection/twitter.png" alt="" class="c_icon"><h1 class="c_name">Twitter</h1></li>
 				<li><label for="">Account</label><input type="text"></li>
 				<li><label for="">Password</label><input type="password"></li>
 				<li>
 					<div class="s_action">
-						<a href="" class="setting_btn thmc1 thmtxt hp">Connect</a>
+						<a href="twitter" class="setting_btn thmc1 thmtxt hp" onclick="return false;" for="new">Connect</a>
+						<a href="twitter" class="setting_btn thmc1 thmtxt hp" onclick="return false;" for="delete" style="display:none;">Remove</a>
 					</div>
 				</li>
 			</ul>
-			<ul class="s_form w2 hp">
-				<li><span class="c_status c_status_on">Connected</span></li>
-				<li><img src="assets/connection/gmail.png" alt="" class="c_icon"><h1 class="c_name">gmail</h1></li>
-				<li><label for="">Account</label><div class="c_info">Harry</div></li>
-				<li><label for="">Password</label><div class="c_info">&#8226;&#8226;&#8226;&#8226;&#8226;&#8226;</div></li>
+			<ul class="s_form w2 hp" id="gmail_connection">
+				<li><span class="c_status">No Connection</span></li>
+				<li><img src="assets/connection/gmail.png" alt="" class="c_icon"><h1 class="c_name">Gmail</h1></li>
+				<li><label for="">Account</label><input type="text"></li><!-- <div class="c_info">Harry</div></li> -->
+				<li><label for="">Password</label><input type="password"></li><!-- <div class="c_info">&#8226;&#8226;&#8226;&#8226;&#8226;&#8226;</div></li> -->
 				<li>
 					<div class="s_action">
-						<a href="" class="setting_btn thmc1 thmtxt hp">Edit</a>
-						<a href="" class="setting_btn thmc1 thmtxt hp">Remove</a>
+						<a href="gmail" class="setting_btn thmc1 thmtxt hp" onclick="return false;" for="new">Connect</a>
+						<a href="gmail" class="setting_btn thmc1 thmtxt hp" onclick="return false;" for="delete" style="display:none;">Remove</a>
 					</div>
 				</li>
 			</ul>
diff --git a/config/routes.rb b/config/routes.rb
index 8c9b3d75..9dfe9218 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -119,6 +119,7 @@ Orbit::Application.routes.draw do
   match '/desktop/journal_p_add/'=>'desktop#journal_p_add'
   match '/desktop/settingconnection/'=>'desktop#settingconnection'
   match '/desktop/forgmail/'=>'otheraccounts#gmail'
+  match '/desktop/getaccounts'=>'otheraccounts#getaccounts'
   match '/desktop/save_account_info/'=>'otheraccounts#saveaccountinfo'
   
   match '/desktop/temp_func/'=>'desktop#temp_func'
diff --git a/public/desktop_widgets/gmail/gmail.js b/public/desktop_widgets/gmail/gmail.js
index 91ae6063..f68298d5 100644
--- a/public/desktop_widgets/gmail/gmail.js
+++ b/public/desktop_widgets/gmail/gmail.js
@@ -3,32 +3,37 @@ var gmail = function(){
 	   		url: "/desktop/forgmail",
 			dataType : "xml",
 			success:function(data){
-				if($(data).find("HEAD").find("TITLE").text()=="Unauthorized"){
-					$("#gmail #forerror").text($(data).find("HEAD").find("TITLE").text()).show();
+				if($(data).find("HEAD").find("ERROR").text()=="true"){
+					$("#gmail #content #msgbody").text($(data).find("HEAD").find("ERRORMSG").text());
 				}else{
-					if($(data).find("fullcount").text()=="0"){
-						$("#gmail #forerror").hide();
-						$("#gmail #content #msgbody").text("No new mails");
+					if($(data).find("HEAD").find("TITLE").text()=="Unauthorized"){
+						$("#gmail #forerror").text($(data).find("HEAD").find("TITLE").text()).show();
 					}else{
-						var msg;
-						if($(data).find("fullcount").text()=="1")
-							msg = $(data).find("fullcount").text()+" unread message in your inbox.";
-						else
-							msg = $(data).find("fullcount").text()+" unread messages in your inbox.";
-						o.notify(msg,"alert",2);
-						$(data).find("entry").each(function(i,val){
-							if(i==0){
-								$("#gmail #forerror").hide();
-								var atag = $("<a href='"+$(this).find("link").attr("href")+"'>"+$(this).find("title").text()+"</a>");
-								$("#gmail #content #subject").html($(this).find("title").text());
-								$("#gmail #content #date").text($(this).find("issued").text());
-								$("#gmail #content #msgbody").text($(this).find("summary").text());
-							}
-						})
+						if($(data).find("fullcount").text()=="0"){
+							$("#gmail #forerror").hide();
+							$("#gmail #content #msgbody").text("No new mails");
+						}else{
+							var msg;
+							if($(data).find("fullcount").text()=="1")
+								msg = $(data).find("fullcount").text()+" unread message in your inbox.";
+							else
+								msg = $(data).find("fullcount").text()+" unread messages in your inbox.";
+							o.notify(msg,"alert",2);
+							$(data).find("entry").each(function(i,val){
+								if(i==0){
+									$("#gmail #forerror").hide();
+									var atag = $("<a href='"+$(this).find("link").attr("href")+"'>"+$(this).find("title").text()+"</a>");
+									$("#gmail #content #subject").html($(this).find("title").text());
+									$("#gmail #content #date").text($(this).find("issued").text());
+									$("#gmail #content #msgbody").text($(this).find("summary").text());
+								}
+							})
+						}
 					}
 				}
 				$("#gmail #loading").hide();
 				$("#gmail #content").show();
+				
 			}
 		});
 }