diff --git a/ui/2.1/css/cloud_custom.css b/ui/2.1/css/cloud_custom.css
index 94e97356ec0..920358b3403 100644
--- a/ui/2.1/css/cloud_custom.css
+++ b/ui/2.1/css/cloud_custom.css
@@ -425,6 +425,10 @@ a:hover.add_diskoffbutton  {
 		background:url(../images/v1grid_morebutton_hover.gif) no-repeat top left;
 }
 
+/* Customized jquery css
+----------------------------------*/
+
+
 .ui-widget-header { 
 	border: 1px solid #c0bfbf; 
 	background: #41546d url(../images/v1_popupheaderbg.gif) 50% 50% repeat-x; 
@@ -439,3 +443,98 @@ a:hover.add_diskoffbutton  {
 
 .ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: -0.2em 1em .5em .4em; }
 .ui-dialog .ui-dialog-buttonpane button { float: right; margin: .5em .4em .5em 0; cursor: pointer; padding: -0.2em .6em .3em .6em; line-height: 1.4em; width:auto; overflow:visible; }
+
+
+/* Form in dialog
+----------------------------------*/
+.dialog_formcontent{ width:auto; height:auto; float:left; margin-top:10px; padding:0; color:#FFF; font-size:11px; margin-left:0; display:inline;}
+.dialog_formcontent ol { width:auto; height:auto; color:#333; float:left; font-family:Arial, Helvetica, sans-serif; font-size:11px; list-style:none; margin:0; padding:0;}
+.dialog_formcontent li { width:auto; height:auto; float:left; padding-bottom: 2px; color:#FFF; font-size:12px; font-weight:normal; text-align:left; margin:0 0 0 0;}
+.dialog_formcontent label { width:100px; float:left; text-align:left; font-weight:bold; margin:0px 5px 5px 5px; color:#333; font-size:11px; font-weight:normal;}
+.dialog_formcontent p{ width:auto; float:left; text-align:left; font-weight:bold; margin:0; color:#333; font-size:11px; font-weight:normal;}
+.dialog_formcontent .radio { width:15px; height:15px; float:left; margin:0 10px 0 0; padding:0;}
+.dialog_formcontent .checkbox { width:12px; height:12px; float:left; margin:0 10px 0 0; padding:0;}
+.dialog_formcontent .text { background-color: #f4f2f2; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: 16px; width: 150px; margin:0 5px 3px 0; padding:0; color:#666;}
+.dialog_formcontent .text2 { background-color: #f4f2f2; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: 14px; width: auto; margin:0 0 0 0; padding:0; color:#666;}
+.dialog_formcontent .smalltext { background-color: #f4f2f2; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: 14px; width: 67px; margin:0 5px 3px 0 padding:0; color:#666;}
+.dialog_formcontent .error_smalltext { background-color: #fbabb3; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: 14px; width: 67px; margin:0 5px 3px 0; padding:0; color:#666;}
+.dialog_formcontent_errormsg {font: normal 10px Arial, Helvetica, sans-serif; float:left; height: auto; width: 160px; margin:0 10px 2px 110px; padding:0; color:#F00; display:inline;}
+.dialog_formcontent_errormsg_long {font: normal 10px Arial, Helvetica, sans-serif; float:left; height: auto; width: 250px; margin:2px 10px 2px 0;  padding:0; color:#F00; display:inline;}
+.dialog_formcontent .select { background-color: #f4f2f2; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: auto; min-width: 153px; padding:0; color:#666; margin:0 10px 3px 0;}
+.dialog_formcontent .snapselect { background-color: #f4f2f2; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: auto; width: 70px; padding:0; color:#666; margin:0 0 0 0;}
+.dialog_formcontent .error_text { background-color: #fbabb3; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: 14px; width: 150px; margin:0 10px 0 0; padding:0; color:#666;} 
+.dialog_formcontent .error_text2 { background-color: #fbabb3; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: 14px; width: auto; margin:0 0 0 0; padding:0; color:#666;} 
+.dialog_formcontent .error_icon { width:15px; height:12px; float:left; background:url(images/alert_icon.png) no-repeat top left; margin:2px 0 0 3px; padding:0;}
+.dialog_formcontent span {font-family:Arial, Helvetica, sans-serif; font-size:11px; text-align:left; color:#333; font-weight:normal; float:left; margin:0 5px 0 0; padding:0;}
+.dialog_formcontent a { color:#2c8bbc; font-size:11px; font-weight:normal; text-align:left; text-decoration:underline; float:left; margin:0; padding:0;}
+.dialog_formcontent a:link .dialog_formcontent a:visited { text-decoration:underline;}
+dialog_formcontent a:hover { text-decoration:none;}
+
+/* Snapshots in dialog
+----------------------------------*/
+.dialog_snapshotbox {width:auto; height:auto; float:left; display:block;  margin:0; padding:0;}
+.dialog_snapshotcontainer {width:auto height:auto; display:block; float:left; margin:0; padding:0;}
+.dialog_snapshotleft {width:500px; height:135px; float:left;display:block;  margin:0; padding:0;}
+.dialog_snapshotleft_list {width:705px; height:auto; float:left; margin:0 0 10px 0; padding:0;  color:#333; font-size:11px;}
+.dialog_snapshotleft_info {width:470px; height:auto; float:left; margin:0 0 10px 0; padding:0;  color:#333; font-size:11px;}
+.dialog_snapshotleft_info p {width:auto; height:auto; float:left; color:#333; font-size:11px; font-weight:normal; margin:0; padding:0;}
+.dialog_snapshotleft_info span {width:auto; height:auto; float:left; color:#333; font-size:11px; font-weight:bold; margin:0 2px 0 2px; padding:0;}
+.dialog_snapshotleft_label {width:60px; height:auto; float:left; color:#457700; font-size:11px; font-weight:bold; margin:0; padding:0;}
+.dialog_snapshotleft_max {width:75px; height:auto; float:left; margin:0 5px 0 0; padding:0;  color:#333; font-size:11px;}
+.dialog_snapshotleft_max p {width:auto; height:auto; float:left; margin:0 5px 0 0; padding:0;  color:#666; font-weight:bold; font-size:11px;}
+.dialog_snapshotleft_max span {width:auto; height:auto; float:left; color:#333; font-size:11px; font-weight:bold; margin:0; padding:0;}
+.dialog_snapshotleft_actions {width:80px; height:auto; float:left; margin:0 5px 0 0; padding:0;  color:#333; font-size:11px;}
+.dialog_snapshotleft_actions a:link {width:auto; height:auto; margin:0 5px 0 0; padding:0;  color:#2c8bbc; text-decoration:none; font-size:11px;}
+.dialog_snapshotleft_actions a:visited {width:auto; height:auto; margin:0 5px 0 0; padding:0;  color:#2c8bbc; text-decoration:none; font-size:11px;}
+.dialog_snapshotleft_actions a:hover {width:auto; height:auto; margin:0 5px 0 0; padding:0;  color:#2c8bbc; text-decoration:underline; font-size:11px;}
+.dialog_snapshotright {width:705px; height:0px; float:left; display:none;  margin:0; padding:15px 0 0 0;  border-top:1px solid #666;}
+.dialog_snapshotright_infotext{width:360px; height:160px; float:left; display:none;  margin:0; padding:0; font-size:15px; font-family:Arial, Helvetica, sans-serif; font-size:normal; text-align:left; margin:10px; color:#333;}
+.dialog_snapshots_editcontent {width:350px; height:auto; float:left; margin:0; padding:0;}
+.dialog_snapshots_editcontent_title {width:280px; height:auto; float:left; margin:0; padding:0;}
+.dialog_snapshots_editcontent_title p {width:auto; height:auto; float:left; margin:0; padding:0; font-size:14px; font-weight:normal;}
+.dialog_snapshots_editcontent_title span{width:auto; height:auto; float:left; margin:0 0 0 5px; display:inline; padding:0; font-size:14px; font-weight:bold;}
+
+
+/* Snapshots
+----------------------------------*/
+.dialog_snapshotformcontent{ width:370px; height:auto; float:left; margin-top:10px; padding:0; color:#FFF; font-size:11px; margin-left:0; display:inline;}
+.dialog_snapshotformcontent h2{ width:auto; height:auto; float:left; margin-left:10px; padding:0; font-size:15px; color:#77c4df; font-weight:normal;}
+.dialog_snapshotformcontent ol { width:auto; height:auto; color:#333; float:left; font-family:Arial, Helvetica, sans-serif; font-size:11px; list-style:none; margin:0; padding:0;}
+.dialog_snapshotformcontent li { width:auto; float:left; padding-bottom: 5px; color:#FFF; font-size:12px; font-weight:normal; text-align:left; margin-top:5px;}
+.dialog_snapshotformcontent label { width:auto; float:left; text-align:left; font-weight:bold; margin:0 5px 0 5px; color:#333; font-size:11px; font-weight:normal;}
+.dialog_snapshotformcontent span { width:auto; float:left; text-align:left; font-weight:normal; margin: 0 0 0 5px; color:#333; font-size:11px; font-weight:normal;}
+.dialog_snapshotformcontent .radio { width:15px; height:15px; float:left; margin:0; padding:0;}
+.dialog_snapshotformcontent .checkbox { width:15px; height:15px; float:left; margin:0; padding:0;}
+.dialog_snapshotformcontent .text { background-color: #f4f2f2; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: 14px; width: 200px; margin:0; padding:0; color:#666;}
+.dialog_snapshotformcontent .error_text { background-color: #fbabb3; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: 14px; width: 200px; margin:0; padding:0; color:#666;}
+.dialog_snapshotformcontent a[title] { background-color: #FFF; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: 14px; width: 200px; margin:0; padding:0; color:#666;}
+.dialog_snapshotformcontent .select { background-color: #f4f2f2; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: auto; min-width: 150px; margin-left:5px; padding:0; color:#666;}
+.frequency_left {width:150px; height:30px; float:left; margin:0; padding:0;}
+.frequency_left h2 {width:auto; height:auto; float:left; margin-left:3px; padding:0; font-size:15px; color:#77c4df; font-weight:normal; }
+.retention_right {width:200px; height:30px; float:left; margin:0; padding:0;}
+.retention_right h2 {width:auto; height:auto; float:left; margin-left:3px; padding:0; font-size:15px; color:#77c4df; font-weight:normal; }
+
+
+/* Selectable
+----------------------------------*/
+.selectable .ui-selecting { background: #cbe4eb; }
+.selectable .ui-selected { background: #cbe4eb; color: #333; }
+.selectable {width:220px; height:190px; margin:20px 0 0 10px; float:left; list-style-type: none; padding: 0; overflow-x:hidden;overflow-y:auto; display:inline;}
+.selectable li { width: 183px; height:15px; margin: 3px; padding: 0.4em; font-size: 11px; background:#FFF repeat top left; border:1px solid #e2e2e2; font-family:Arial, Helvetica, sans-serif; }
+.sortable_grouppanel { width:525px; height:auto; float:left; margin:5px; padding:0;}
+.sortable_grouppanel h2 { width:200px; height:auto; float:left; font-size:15px; color:#77c4df; font-weight:normal; text-align:left; margin:0; padding:0;}
+.sortable_group_left { width:236px; height:250px; float:left; margin:0; padding:0;}
+.sortable_group_mid { width:50px; height:250px; float:left; margin:0; padding:0;}
+.sortable_direction_box {width:41px; height:55px; float:left; margin:70px 0 0 7px; display:inline; padding:0;}
+.rightarrow_button {width:41px; height:23px; float:left; text-decoration: none; margin:0; padding:0; background:url(images/sortable_rightarrow.gif) no-repeat top left; cursor:pointer; cursor:hand;}
+.rightarrow_button:hover {background:url(images/sortable_rightarrow_hover.gif) no-repeat top left;}
+.leftarrow_button {width:41px; height:23px; float:left; text-decoration: none; margin-top:9px; padding:0; background:url(images/sortable_leftarrow.gif) no-repeat top left; cursor:pointer; cursor:hand;}
+.leftarrow_button:hover {background:url(images/sortable_leftarrow_hover.gif) no-repeat top left;}
+.sortable_group_right { width:236px; height:250px; float:left; margin:0; padding:0;}
+.sortable_groupbox{ width:233px; height:220px; float:left; margin-top:5px; padding:0; background:url(images/sortable_groupbox.gif);}
+.selectable_errorbox { width:492px; height:auto; float:left; background:#fcf3f2 repeat top left; border:1px solid #f2a89f;color:#d23c2b; font-family:Arial, Helvetica, sans-serif; font-size:11px; margin: 5px 0 0 10px;; display:inline;}
+.selectable_errorbox p { width:auto; height:auto; float:left; margin: 5px; display:inline;}
+.selectable_commentbox { width:492px; height:auto; float:left; background:#fff5d4 repeat top left; border:1px solid #ddbb45; color:#333; font-family:Arial, Helvetica, sans-serif; font-size:11px; margin: 5px 0 0 10px; display:inline;}
+.selectable_commentbox p { width:auto; height:auto; float:left; margin: 5px; display:inline;}
+.selectable_loader { width:16px; height:16px; background:url(images/comment_loader.gif) no-repeat top left; float:left; margin:5px;}
+
diff --git a/ui/2.1/css/jquery-ui-1.7.2.custom.css b/ui/2.1/css/jquery-ui-1.7.2.custom.css
index 038da424046..a3d4c5c6d36 100644
--- a/ui/2.1/css/jquery-ui-1.7.2.custom.css
+++ b/ui/2.1/css/jquery-ui-1.7.2.custom.css
@@ -371,54 +371,7 @@
 .ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
 .ui-draggable .ui-dialog-titlebar { cursor: move; }
 
-/* Form in dialog
-----------------------------------*/
-.dialog_formcontent{ width:auto; height:auto; float:left; margin-top:10px; padding:0; color:#FFF; font-size:11px; margin-left:0; display:inline;}
-.dialog_formcontent ol { width:auto; height:auto; color:#333; float:left; font-family:Arial, Helvetica, sans-serif; font-size:11px; list-style:none; margin:0; padding:0;}
-.dialog_formcontent li { width:auto; height:auto; float:left; padding-bottom: 2px; color:#FFF; font-size:12px; font-weight:normal; text-align:left; margin:0 0 0 0;}
-.dialog_formcontent label { width:100px; float:left; text-align:left; font-weight:bold; margin:0px 5px 5px 5px; color:#333; font-size:11px; font-weight:normal;}
-.dialog_formcontent p{ width:auto; float:left; text-align:left; font-weight:bold; margin:0; color:#333; font-size:11px; font-weight:normal;}
-.dialog_formcontent .radio { width:15px; height:15px; float:left; margin:0 10px 0 0; padding:0;}
-.dialog_formcontent .checkbox { width:12px; height:12px; float:left; margin:0 10px 0 0; padding:0;}
-.dialog_formcontent .text { background-color: #f4f2f2; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: 16px; width: 150px; margin:0 5px 3px 0; padding:0; color:#666;}
-.dialog_formcontent .text2 { background-color: #f4f2f2; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: 14px; width: auto; margin:0 0 0 0; padding:0; color:#666;}
-.dialog_formcontent .smalltext { background-color: #f4f2f2; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: 14px; width: 67px; margin:0 5px 3px 0 padding:0; color:#666;}
-.dialog_formcontent .error_smalltext { background-color: #fbabb3; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: 14px; width: 67px; margin:0 5px 3px 0; padding:0; color:#666;}
-.dialog_formcontent_errormsg {font: normal 10px Arial, Helvetica, sans-serif; float:left; height: auto; width: 160px; margin:0 10px 2px 110px; padding:0; color:#F00; display:inline;}
-.dialog_formcontent_errormsg_long {font: normal 10px Arial, Helvetica, sans-serif; float:left; height: auto; width: 250px; margin:2px 10px 2px 0;  padding:0; color:#F00; display:inline;}
-.dialog_formcontent .select { background-color: #f4f2f2; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: auto; min-width: 153px; padding:0; color:#666; margin:0 10px 3px 0;}
-.dialog_formcontent .snapselect { background-color: #f4f2f2; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: auto; width: 70px; padding:0; color:#666; margin:0 0 0 0;}
-.dialog_formcontent .error_text { background-color: #fbabb3; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: 14px; width: 150px; margin:0 10px 0 0; padding:0; color:#666;} 
-.dialog_formcontent .error_text2 { background-color: #fbabb3; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: 14px; width: auto; margin:0 0 0 0; padding:0; color:#666;} 
-.dialog_formcontent .error_icon { width:15px; height:12px; float:left; background:url(images/alert_icon.png) no-repeat top left; margin:2px 0 0 3px; padding:0;}
-.dialog_formcontent span {font-family:Arial, Helvetica, sans-serif; font-size:11px; text-align:left; color:#333; font-weight:normal; float:left; margin:0 5px 0 0; padding:0;}
-.dialog_formcontent a { color:#2c8bbc; font-size:11px; font-weight:normal; text-align:left; text-decoration:underline; float:left; margin:0; padding:0;}
-.dialog_formcontent a:link .dialog_formcontent a:visited { text-decoration:underline;}
-dialog_formcontent a:hover { text-decoration:none;}
 
-/* Snapshots in dialog
-----------------------------------*/
-.dialog_snapshotbox {width:auto; height:auto; float:left; display:block;  margin:0; padding:0;}
-.dialog_snapshotcontainer {width:auto height:auto; display:block; float:left; margin:0; padding:0;}
-.dialog_snapshotleft {width:500px; height:135px; float:left;display:block;  margin:0; padding:0;}
-.dialog_snapshotleft_list {width:705px; height:auto; float:left; margin:0 0 10px 0; padding:0;  color:#333; font-size:11px;}
-.dialog_snapshotleft_info {width:470px; height:auto; float:left; margin:0 0 10px 0; padding:0;  color:#333; font-size:11px;}
-.dialog_snapshotleft_info p {width:auto; height:auto; float:left; color:#333; font-size:11px; font-weight:normal; margin:0; padding:0;}
-.dialog_snapshotleft_info span {width:auto; height:auto; float:left; color:#333; font-size:11px; font-weight:bold; margin:0 2px 0 2px; padding:0;}
-.dialog_snapshotleft_label {width:60px; height:auto; float:left; color:#457700; font-size:11px; font-weight:bold; margin:0; padding:0;}
-.dialog_snapshotleft_max {width:75px; height:auto; float:left; margin:0 5px 0 0; padding:0;  color:#333; font-size:11px;}
-.dialog_snapshotleft_max p {width:auto; height:auto; float:left; margin:0 5px 0 0; padding:0;  color:#666; font-weight:bold; font-size:11px;}
-.dialog_snapshotleft_max span {width:auto; height:auto; float:left; color:#333; font-size:11px; font-weight:bold; margin:0; padding:0;}
-.dialog_snapshotleft_actions {width:80px; height:auto; float:left; margin:0 5px 0 0; padding:0;  color:#333; font-size:11px;}
-.dialog_snapshotleft_actions a:link {width:auto; height:auto; margin:0 5px 0 0; padding:0;  color:#2c8bbc; text-decoration:none; font-size:11px;}
-.dialog_snapshotleft_actions a:visited {width:auto; height:auto; margin:0 5px 0 0; padding:0;  color:#2c8bbc; text-decoration:none; font-size:11px;}
-.dialog_snapshotleft_actions a:hover {width:auto; height:auto; margin:0 5px 0 0; padding:0;  color:#2c8bbc; text-decoration:underline; font-size:11px;}
-.dialog_snapshotright {width:705px; height:0px; float:left; display:none;  margin:0; padding:15px 0 0 0;  border-top:1px solid #666;}
-.dialog_snapshotright_infotext{width:360px; height:160px; float:left; display:none;  margin:0; padding:0; font-size:15px; font-family:Arial, Helvetica, sans-serif; font-size:normal; text-align:left; margin:10px; color:#333;}
-.dialog_snapshots_editcontent {width:350px; height:auto; float:left; margin:0; padding:0;}
-.dialog_snapshots_editcontent_title {width:280px; height:auto; float:left; margin:0; padding:0;}
-.dialog_snapshots_editcontent_title p {width:auto; height:auto; float:left; margin:0; padding:0; font-size:14px; font-weight:normal;}
-.dialog_snapshots_editcontent_title span{width:auto; height:auto; float:left; margin:0 0 0 5px; display:inline; padding:0; font-size:14px; font-weight:bold;}
 
 /* Progressbar
 ----------------------------------*/
@@ -465,46 +418,3 @@ dialog_formcontent a:hover { text-decoration:none;}
 
 
 
-/* Snapshots
-----------------------------------*/
-.dialog_snapshotformcontent{ width:370px; height:auto; float:left; margin-top:10px; padding:0; color:#FFF; font-size:11px; margin-left:0; display:inline;}
-.dialog_snapshotformcontent h2{ width:auto; height:auto; float:left; margin-left:10px; padding:0; font-size:15px; color:#77c4df; font-weight:normal;}
-.dialog_snapshotformcontent ol { width:auto; height:auto; color:#333; float:left; font-family:Arial, Helvetica, sans-serif; font-size:11px; list-style:none; margin:0; padding:0;}
-.dialog_snapshotformcontent li { width:auto; float:left; padding-bottom: 5px; color:#FFF; font-size:12px; font-weight:normal; text-align:left; margin-top:5px;}
-.dialog_snapshotformcontent label { width:auto; float:left; text-align:left; font-weight:bold; margin:0 5px 0 5px; color:#333; font-size:11px; font-weight:normal;}
-.dialog_snapshotformcontent span { width:auto; float:left; text-align:left; font-weight:normal; margin: 0 0 0 5px; color:#333; font-size:11px; font-weight:normal;}
-.dialog_snapshotformcontent .radio { width:15px; height:15px; float:left; margin:0; padding:0;}
-.dialog_snapshotformcontent .checkbox { width:15px; height:15px; float:left; margin:0; padding:0;}
-.dialog_snapshotformcontent .text { background-color: #f4f2f2; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: 14px; width: 200px; margin:0; padding:0; color:#666;}
-.dialog_snapshotformcontent .error_text { background-color: #fbabb3; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: 14px; width: 200px; margin:0; padding:0; color:#666;}
-.dialog_snapshotformcontent a[title] { background-color: #FFF; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: 14px; width: 200px; margin:0; padding:0; color:#666;}
-.dialog_snapshotformcontent .select { background-color: #f4f2f2; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: auto; min-width: 150px; margin-left:5px; padding:0; color:#666;}
-.frequency_left {width:150px; height:30px; float:left; margin:0; padding:0;}
-.frequency_left h2 {width:auto; height:auto; float:left; margin-left:3px; padding:0; font-size:15px; color:#77c4df; font-weight:normal; }
-.retention_right {width:200px; height:30px; float:left; margin:0; padding:0;}
-.retention_right h2 {width:auto; height:auto; float:left; margin-left:3px; padding:0; font-size:15px; color:#77c4df; font-weight:normal; }
-
-
-/* Selectable
-----------------------------------*/
-.selectable .ui-selecting { background: #cbe4eb; }
-.selectable .ui-selected { background: #cbe4eb; color: #333; }
-.selectable {width:220px; height:190px; margin:20px 0 0 10px; float:left; list-style-type: none; padding: 0; overflow-x:hidden;overflow-y:auto; display:inline;}
-.selectable li { width: 183px; height:15px; margin: 3px; padding: 0.4em; font-size: 11px; background:#FFF repeat top left; border:1px solid #e2e2e2; font-family:Arial, Helvetica, sans-serif; }
-.sortable_grouppanel { width:525px; height:auto; float:left; margin:5px; padding:0;}
-.sortable_grouppanel h2 { width:200px; height:auto; float:left; font-size:15px; color:#77c4df; font-weight:normal; text-align:left; margin:0; padding:0;}
-.sortable_group_left { width:236px; height:250px; float:left; margin:0; padding:0;}
-.sortable_group_mid { width:50px; height:250px; float:left; margin:0; padding:0;}
-.sortable_direction_box {width:41px; height:55px; float:left; margin:70px 0 0 7px; display:inline; padding:0;}
-.rightarrow_button {width:41px; height:23px; float:left; text-decoration: none; margin:0; padding:0; background:url(images/sortable_rightarrow.gif) no-repeat top left; cursor:pointer; cursor:hand;}
-.rightarrow_button:hover {background:url(images/sortable_rightarrow_hover.gif) no-repeat top left;}
-.leftarrow_button {width:41px; height:23px; float:left; text-decoration: none; margin-top:9px; padding:0; background:url(images/sortable_leftarrow.gif) no-repeat top left; cursor:pointer; cursor:hand;}
-.leftarrow_button:hover {background:url(images/sortable_leftarrow_hover.gif) no-repeat top left;}
-.sortable_group_right { width:236px; height:250px; float:left; margin:0; padding:0;}
-.sortable_groupbox{ width:233px; height:220px; float:left; margin-top:5px; padding:0; background:url(images/sortable_groupbox.gif);}
-.selectable_errorbox { width:492px; height:auto; float:left; background:#fcf3f2 repeat top left; border:1px solid #f2a89f;color:#d23c2b; font-family:Arial, Helvetica, sans-serif; font-size:11px; margin: 5px 0 0 10px;; display:inline;}
-.selectable_errorbox p { width:auto; height:auto; float:left; margin: 5px; display:inline;}
-.selectable_commentbox { width:492px; height:auto; float:left; background:#fff5d4 repeat top left; border:1px solid #ddbb45; color:#333; font-family:Arial, Helvetica, sans-serif; font-size:11px; margin: 5px 0 0 10px; display:inline;}
-.selectable_commentbox p { width:auto; height:auto; float:left; margin: 5px; display:inline;}
-.selectable_loader { width:16px; height:16px; background:url(images/comment_loader.gif) no-repeat top left; float:left; margin:5px;}
-
diff --git a/ui/2.1/css/jquery-ui-1.8.2.custom.css b/ui/2.1/css/jquery-ui-1.8.2.custom.css
index 79fd76b0f4f..9e5fd42efc0 100644
--- a/ui/2.1/css/jquery-ui-1.8.2.custom.css
+++ b/ui/2.1/css/jquery-ui-1.8.2.custom.css
@@ -81,7 +81,7 @@
 ----------------------------------*/
 
 /* states and images */
-/* When mouse is over a resizable element, a small black triangle show => which we don't want. So, comment out the following line.*/
+/* When mouse is over a resizable element, a small black triangle show => which we don't want. So, comment out the following line.*/
 /*
 .ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
 */
@@ -496,71 +496,4 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
 .ui-progressbar { height:2em; text-align: left; }
 .ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
 
-/* Form in dialog
-----------------------------------*/
-.dialog_formcontent{ width:auto; height:auto; float:left; margin-top:10px; padding:0; color:#FFF; font-size:11px; margin-left:0; display:inline;}
-.dialog_formcontent ol { width:auto; height:auto; color:#333; float:left; font-family:Arial, Helvetica, sans-serif; font-size:11px; list-style:none; margin:0; padding:0;}
-.dialog_formcontent li { width:auto; height:auto; float:left; padding-bottom: 2px; color:#FFF; font-size:12px; font-weight:normal; text-align:left; margin:0 0 0 0;}
-.dialog_formcontent label { width:100px; float:left; text-align:left; font-weight:bold; margin:0px 5px 5px 5px; color:#333; font-size:11px; font-weight:normal;}
-.dialog_formcontent p{ width:auto; float:left; text-align:left; font-weight:bold; margin:0; color:#333; font-size:11px; font-weight:normal;}
-.dialog_formcontent .radio { width:15px; height:15px; float:left; margin:0 10px 0 0; padding:0;}
-.dialog_formcontent .checkbox { width:12px; height:12px; float:left; margin:0 10px 0 0; padding:0;}
-.dialog_formcontent .text { background-color: #f4f2f2; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: 16px; width: 150px; margin:0 5px 3px 0; padding:0; color:#666;}
-.dialog_formcontent .text2 { background-color: #f4f2f2; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: 14px; width: auto; margin:0 0 0 0; padding:0; color:#666;}
-.dialog_formcontent .smalltext { background-color: #f4f2f2; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: 14px; width: 67px; margin:0 5px 3px 0 padding:0; color:#666;}
-.dialog_formcontent .error_smalltext { background-color: #fbabb3; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: 14px; width: 67px; margin:0 5px 3px 0; padding:0; color:#666;}
-.dialog_formcontent_errormsg {font: normal 10px Arial, Helvetica, sans-serif; float:left; height: auto; width: 160px; margin:0 10px 2px 110px; padding:0; color:#F00; display:inline;}
-.dialog_formcontent_errormsg_long {font: normal 10px Arial, Helvetica, sans-serif; float:left; height: auto; width: 250px; margin:2px 10px 2px 0;  padding:0; color:#F00; display:inline;}
-.dialog_formcontent .select { background-color: #f4f2f2; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: auto; min-width: 153px; padding:0; color:#666; margin:0 10px 3px 0;}
-.dialog_formcontent .snapselect { background-color: #f4f2f2; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: auto; width: 70px; padding:0; color:#666; margin:0 0 0 0;}
-.dialog_formcontent .error_text { background-color: #fbabb3; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: 14px; width: 150px; margin:0 10px 0 0; padding:0; color:#666;} 
-.dialog_formcontent .error_text2 { background-color: #fbabb3; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: 14px; width: auto; margin:0 0 0 0; padding:0; color:#666;} 
-.dialog_formcontent .error_icon { width:15px; height:12px; float:left; background:url(images/alert_icon.png) no-repeat top left; margin:2px 0 0 3px; padding:0;}
-.dialog_formcontent span {font-family:Arial, Helvetica, sans-serif; font-size:11px; text-align:left; color:#333; font-weight:normal; float:left; margin:0 5px 0 0; padding:0;}
-.dialog_formcontent a { color:#2c8bbc; font-size:11px; font-weight:normal; text-align:left; text-decoration:underline; float:left; margin:0; padding:0;}
-.dialog_formcontent a:link .dialog_formcontent a:visited { text-decoration:underline;}
-dialog_formcontent a:hover { text-decoration:none;}
 
-/* Snapshots in dialog
-----------------------------------*/
-.dialog_snapshotbox {width:auto; height:auto; float:left; display:block;  margin:0; padding:0;}
-.dialog_snapshotcontainer {width:auto height:auto; display:block; float:left; margin:0; padding:0;}
-.dialog_snapshotleft {width:500px; height:135px; float:left;display:block;  margin:0; padding:0;}
-.dialog_snapshotleft_list {width:705px; height:auto; float:left; margin:0 0 10px 0; padding:0;  color:#333; font-size:11px;}
-.dialog_snapshotleft_info {width:470px; height:auto; float:left; margin:0 0 10px 0; padding:0;  color:#333; font-size:11px;}
-.dialog_snapshotleft_info p {width:auto; height:auto; float:left; color:#333; font-size:11px; font-weight:normal; margin:0; padding:0;}
-.dialog_snapshotleft_info span {width:auto; height:auto; float:left; color:#333; font-size:11px; font-weight:bold; margin:0 2px 0 2px; padding:0;}
-.dialog_snapshotleft_label {width:60px; height:auto; float:left; color:#457700; font-size:11px; font-weight:bold; margin:0; padding:0;}
-.dialog_snapshotleft_max {width:75px; height:auto; float:left; margin:0 5px 0 0; padding:0;  color:#333; font-size:11px;}
-.dialog_snapshotleft_max p {width:auto; height:auto; float:left; margin:0 5px 0 0; padding:0;  color:#666; font-weight:bold; font-size:11px;}
-.dialog_snapshotleft_max span {width:auto; height:auto; float:left; color:#333; font-size:11px; font-weight:bold; margin:0; padding:0;}
-.dialog_snapshotleft_actions {width:80px; height:auto; float:left; margin:0 5px 0 0; padding:0;  color:#333; font-size:11px;}
-.dialog_snapshotleft_actions a:link {width:auto; height:auto; margin:0 5px 0 0; padding:0;  color:#2c8bbc; text-decoration:none; font-size:11px;}
-.dialog_snapshotleft_actions a:visited {width:auto; height:auto; margin:0 5px 0 0; padding:0;  color:#2c8bbc; text-decoration:none; font-size:11px;}
-.dialog_snapshotleft_actions a:hover {width:auto; height:auto; margin:0 5px 0 0; padding:0;  color:#2c8bbc; text-decoration:underline; font-size:11px;}
-.dialog_snapshotright {width:705px; height:0px; float:left; display:none;  margin:0; padding:15px 0 0 0;  border-top:1px solid #666;}
-.dialog_snapshotright_infotext{width:360px; height:160px; float:left; display:none;  margin:0; padding:0; font-size:15px; font-family:Arial, Helvetica, sans-serif; font-size:normal; text-align:left; margin:10px; color:#333;}
-.dialog_snapshots_editcontent {width:350px; height:auto; float:left; margin:0; padding:0;}
-.dialog_snapshots_editcontent_title {width:280px; height:auto; float:left; margin:0; padding:0;}
-.dialog_snapshots_editcontent_title p {width:auto; height:auto; float:left; margin:0; padding:0; font-size:14px; font-weight:normal;}
-.dialog_snapshots_editcontent_title span{width:auto; height:auto; float:left; margin:0 0 0 5px; display:inline; padding:0; font-size:14px; font-weight:bold;}
-
-
-/* Snapshots
-----------------------------------*/
-.dialog_snapshotformcontent{ width:370px; height:auto; float:left; margin-top:10px; padding:0; color:#FFF; font-size:11px; margin-left:0; display:inline;}
-.dialog_snapshotformcontent h2{ width:auto; height:auto; float:left; margin-left:10px; padding:0; font-size:15px; color:#77c4df; font-weight:normal;}
-.dialog_snapshotformcontent ol { width:auto; height:auto; color:#333; float:left; font-family:Arial, Helvetica, sans-serif; font-size:11px; list-style:none; margin:0; padding:0;}
-.dialog_snapshotformcontent li { width:auto; float:left; padding-bottom: 5px; color:#FFF; font-size:12px; font-weight:normal; text-align:left; margin-top:5px;}
-.dialog_snapshotformcontent label { width:auto; float:left; text-align:left; font-weight:bold; margin:0 5px 0 5px; color:#333; font-size:11px; font-weight:normal;}
-.dialog_snapshotformcontent span { width:auto; float:left; text-align:left; font-weight:normal; margin: 0 0 0 5px; color:#333; font-size:11px; font-weight:normal;}
-.dialog_snapshotformcontent .radio { width:15px; height:15px; float:left; margin:0; padding:0;}
-.dialog_snapshotformcontent .checkbox { width:15px; height:15px; float:left; margin:0; padding:0;}
-.dialog_snapshotformcontent .text { background-color: #f4f2f2; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: 14px; width: 200px; margin:0; padding:0; color:#666;}
-.dialog_snapshotformcontent .error_text { background-color: #fbabb3; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: 14px; width: 200px; margin:0; padding:0; color:#666;}
-.dialog_snapshotformcontent a[title] { background-color: #FFF; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: 14px; width: 200px; margin:0; padding:0; color:#666;}
-.dialog_snapshotformcontent .select { background-color: #f4f2f2; font: normal 11px Arial, Helvetica, sans-serif; float:left; border: 1px solid #999; height: auto; min-width: 150px; margin-left:5px; padding:0; color:#666;}
-.frequency_left {width:150px; height:30px; float:left; margin:0; padding:0;}
-.frequency_left h2 {width:auto; height:auto; float:left; margin-left:3px; padding:0; font-size:15px; color:#77c4df; font-weight:normal; }
-.retention_right {width:200px; height:30px; float:left; margin:0; padding:0;}
-.retention_right h2 {width:auto; height:auto; float:left; margin-left:3px; padding:0; font-size:15px; color:#77c4df; font-weight:normal; }