diff --git a/config.performance.php b/config.performance.php
index ec70047f217176f18ca994dff765efc7aa46190f..d40db3411886764f9ace4563d09680884e6006cc 100644
--- a/config.performance.php
+++ b/config.performance.php
@@ -20,9 +20,6 @@ $PERFORMANCE_CONFIG = Array(
 	// This avoids executing the SET NAMES SQL for each query!
 	'DB_DEFAULT_CHARSET_UTF8' => true,
 
-	// Compute record change indication for each record shown on listview
-	'LISTVIEW_RECORD_CHANGE_INDICATOR' => false,
-
 	// Turn-off default sorting in ListView, could eat up time as data grows
 	'LISTVIEW_DEFAULT_SORTING' => false,
 	
@@ -38,7 +35,5 @@ $PERFORMANCE_CONFIG = Array(
 	// reduce number of ajax requests on home page, reduce this value if home page widget dont
 	// show value.
 	'HOME_PAGE_WIDGET_GROUP_SIZE' => 12,
-	//take backup legacy style, whenever an admin user logs out.
-	'LOGOUT_BACKUP' => true,
 );
-?>
\ No newline at end of file
+?>
diff --git a/config.template.php b/config.template.php
index 88b4b3848820f131db80298ad98bcb74f7d913c9..41abe8efc1a5b8039d470defa584ebbc138f3e47 100644
--- a/config.template.php
+++ b/config.template.php
@@ -28,9 +28,6 @@ ini_set('memory_limit','512M');
 // show or hide calendar, world clock, calculator, chat and CKEditor 
 // Do NOT remove the quotes if you set these to false! 
 $CALENDAR_DISPLAY = 'true';
-$WORLD_CLOCK_DISPLAY = 'true';
-$CALCULATOR_DISPLAY = 'true';
-$CHAT_DISPLAY = 'true'; 
 $USE_RTE = 'true';
 
 // helpdesk support email id and support name (Example: 'support@vtiger.com' and 'vtiger support')
@@ -116,16 +113,9 @@ $allow_exports = 'all';
 // upload_badext default value = php, php3, php4, php5, pl, cgi, py, asp, cfm, js, vbs, html, htm
 $upload_badext = array('php', 'php3', 'php4', 'php5', 'pl', 'cgi', 'py', 'asp', 'cfm', 'js', 'vbs', 'html', 'htm', 'exe', 'bin', 'bat', 'sh', 'dll', 'phps', 'phtml', 'xhtml', 'rb', 'msi', 'jsp', 'shtml', 'sth', 'shtm');
 
-// full path to include directory including the trailing slash
-// includeDirectory default value = $root_directory..'include/
-$includeDirectory = $root_directory.'include/';
-
 // list_max_entries_per_page default value = 20
 $list_max_entries_per_page = '20';
 
-// limitpage_navigation default value = 5
-$limitpage_navigation = '5';
-
 // history_max_viewed default value = 5
 $history_max_viewed = '5';
 
@@ -139,10 +129,6 @@ $default_action = 'index';
 // default_theme default value = blue
 $default_theme = 'softed';
 
-// show or hide time to compose each page
-// calculate_response_time default value = true
-$calculate_response_time = true;
-
 // default text that is placed initially in the login form for user name
 // no default_user_name default value
 $default_user_name = '';
@@ -154,12 +140,6 @@ $default_password = '';
 // create user with default username and password
 // create_default_user default value = false
 $create_default_user = false;
-// default_user_is_admin default value = false
-$default_user_is_admin = false;
-
-// if your MySQL/PHP configuration does not support persistent connections set this to true to avoid a large performance slowdown
-// disable_persistent_connections default value = false
-$disable_persistent_connections = false;
 
 //Master currency name
 $currency_name = '_MASTER_CURRENCY_';
@@ -172,13 +152,6 @@ $default_charset = '_VT_CHARSET_';
 // default_language default value = en_us
 $default_language = '_VT_DEFAULT_LANGUAGE_';
 
-// add the language pack name to every translation string in the display.
-// translation_string_prefix default value = false
-$translation_string_prefix = false;
-
-//Option to cache tabs permissions for speed.
-$cache_tab_perms = true;
-
 //Option to hide empty home blocks if no entries.
 $display_empty_home_blocks = false;
 
diff --git a/include/QueryGenerator/EnhancedQueryGenerator.php b/include/QueryGenerator/EnhancedQueryGenerator.php
index d3d067ee547f2dfc98c786b156878123d43b427f..a9f8c3f9ba065812ef54467403cc216fca2c8499 100644
--- a/include/QueryGenerator/EnhancedQueryGenerator.php
+++ b/include/QueryGenerator/EnhancedQueryGenerator.php
@@ -829,6 +829,20 @@ class EnhancedQueryGenerator extends QueryGenerator {
 			$fieldSqlList[$index] = $fieldSql;
 		}
 
+		$currentUserModel = Users_Record_Model::getCurrentUserModel();
+		if(($baseModule == 'Calendar' || $baseModule == 'Events') && !$currentUserModel->isAdminUser()) {
+			$moduleFocus = CRMEntity::getInstance('Calendar');
+			$condition = $moduleFocus->buildWhereClauseConditionForCalendar();
+
+			if($condition) {
+				if($this->conditionInstanceCount > 0) {
+					$sql .= $condition.' AND ';
+				}else {
+					$sql .= ' AND '.$condition;
+				}
+			}
+		}
+
 		// This is needed as there can be condition in different order and there is an assumption in makeGroupSqlReplacements API
 		// that it expects the array in an order and then replaces the sql with its the corresponding place
 		ksort($fieldSqlList);
diff --git a/include/QueryGenerator/QueryGenerator.php b/include/QueryGenerator/QueryGenerator.php
index 737cafabe6a2dd304215bebdf544a368ca4feffa..c548e93969e119863fd0b3a9c2d1a6de8d43d219 100644
--- a/include/QueryGenerator/QueryGenerator.php
+++ b/include/QueryGenerator/QueryGenerator.php
@@ -919,6 +919,20 @@ class QueryGenerator {
 				$fieldSqlList[$index] = $fieldSql;
 			}
 		}
+
+		$currentUserModel = Users_Record_Model::getCurrentUserModel();
+		if(($baseModule == 'Calendar' || $baseModule == 'Events') && !$currentUserModel->isAdminUser()) {
+			$moduleFocus = CRMEntity::getInstance('Calendar');
+			$condition = $moduleFocus->buildWhereClauseConditionForCalendar();
+			if ($condition) {
+				if ($this->conditionInstanceCount > 0) {
+					$sql .= $condition . ' AND ';
+				} else {
+					$sql .= ' AND ' . $condition;
+				}
+			}
+		}
+		
 		// This is needed as there can be condition in different order and there is an assumption in makeGroupSqlReplacements API
 		// that it expects the array in an order and then replaces the sql with its the corresponding place
 		ksort($fieldSqlList);
diff --git a/include/utils/VtlibUtils.php b/include/utils/VtlibUtils.php
index a96f5e88445a77d5a2213e63f43f0e91ae9aa510..c7cb39e8898c5a559bbfe4d09780367ffcb7808c 100644
--- a/include/utils/VtlibUtils.php
+++ b/include/utils/VtlibUtils.php
@@ -349,7 +349,10 @@ function __vtlib_get_modulevar_value($module, $varname) {
 				'IsCustomModule'=>false,
 				'table_name' => 'vtiger_quotes',
 				'table_index'=> 'quoteid',
-				'related_tables' => Array ('vtiger_account' => Array('accountid')),
+				'related_tables' => Array (
+					'vtiger_quotescf' => array('quoteid', 'vtiger_quotes', 'quoteid'),
+					'vtiger_account' => Array('accountid')
+				),
 				'popup_fields'=>Array('subject'),
 			),
 			'SalesOrder'=>
@@ -357,7 +360,10 @@ function __vtlib_get_modulevar_value($module, $varname) {
 				'IsCustomModule'=>false,
 				'table_name' => 'vtiger_salesorder',
 				'table_index'=> 'salesorderid',
-				'related_tables'=> Array ('vtiger_account' => Array('accountid')),
+				'related_tables'=> Array (
+					'vtiger_salesordercf' => array('salesorderid', 'vtiger_salesorder', 'salesorderid'),
+					'vtiger_account' => Array('accountid')
+				),
 				'popup_fields'=>Array('subject'),
 			),
 			'PurchaseOrder'=>
@@ -404,6 +410,9 @@ function __vtlib_get_modulevar_value($module, $varname) {
 				'IsCustomModule'=>false,
 				'table_name' => 'vtiger_notes',
 				'table_index'=> 'notesid',
+				'related_tables' => Array(
+					'vtiger_notescf' => Array('notesid', 'vtiger_notes', 'notesid')
+				),
 			),
 			'Products'=>
 			Array(
@@ -427,6 +436,9 @@ function __vtlib_get_modulevar_value($module, $varname) {
 				'table_name' => 'vtiger_vendor',
 				'table_index'=> 'vendorid',
 				'popup_fields'=>Array('vendorname'),
+				'related_tables'=> Array( 
+					'vtiger_vendorcf' => Array('vendorid', 'vtiger_vendor', 'vendorid')
+					),
 			),
 			'Project' => 
 			Array(
diff --git a/include/utils/utils.php b/include/utils/utils.php
index 6f59325c7d279265ecf839de2e683f47a80c3273..965910a3f85cb8906a7571806ac87490a44d11d9 100755
--- a/include/utils/utils.php
+++ b/include/utils/utils.php
@@ -334,7 +334,7 @@ function set_default_config(&$defaults)
  */
 function decide_to_html() {
 	global $doconvert, $inUTF8, $default_charset;
- 	$action = $_REQUEST['action']; 
+ 	$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : ''; 
  		     
     $inUTF8 = (strtoupper($default_charset) == 'UTF-8'); 
 
@@ -2620,4 +2620,4 @@ function getDuplicatesPreventionMessage($moduleName, $duplicateRecordsList) {
 	return $message;
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/runtime/LanguageHandler.php b/includes/runtime/LanguageHandler.php
index 6af2e4b56e6e2c4835fbfbcef4877c4c44d799bb..e2a993f87b5dd57bf395da113e720df44770c41e 100644
--- a/includes/runtime/LanguageHandler.php
+++ b/includes/runtime/LanguageHandler.php
@@ -147,7 +147,7 @@ class Vtiger_Language_Handler {
 	public static function getLanguage() {
 		$userModel = Users_Record_Model::getCurrentUserModel();
 		$language = '';
-		if (!empty($userModel)) {
+		if (!empty($userModel) && $userModel->has('language')) {
 			$language = $userModel->get('language');
 		}
 		return empty($language) ? vglobal('default_language') : $language;
diff --git a/languages/en_us/Install.php b/languages/en_us/Install.php
index 342fa66bd55cd52b8c108314d8809b7dc14e514a..7ddd329396035dbcaa0bf17a6481965c32cbde7e 100644
--- a/languages/en_us/Install.php
+++ b/languages/en_us/Install.php
@@ -11,6 +11,7 @@
 $languageStrings = array(
 	'ERR_DATABASE_CONNECTION_FAILED' => 'Unable to connect to database Server',
 	'ERR_DB_NOT_FOUND' => 'This Database is not found.Try changing the Database settings',
+	'ERR_DB_NOT_UTF8'  => 'Database charset or collation not compatible with UTF8',
 	'ERR_INVALID_MYSQL_PARAMETERS' => 'Invalid mySQL Connection Parameters specified',
 	'ERR_INVALID_MYSQL_VERSION' => 'MySQL version is not supported, kindly connect to MySQL 5.1.x or above',
 	'ERR_UNABLE_CREATE_DATABASE' => 'Unable to Create database',
diff --git a/layouts/v7/modules/Documents/ListViewRecordActions.tpl b/layouts/v7/modules/Documents/ListViewRecordActions.tpl
index 7df9705a4a74d9b4f1510d13192057060814f481..ea89bd38a55a36f0bd698f7683bac2602e86379a 100644
--- a/layouts/v7/modules/Documents/ListViewRecordActions.tpl
+++ b/layouts/v7/modules/Documents/ListViewRecordActions.tpl
@@ -26,7 +26,7 @@
 		</span>
 	{/if}
     <span class="more dropdown action">
-        <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v icon"></i></a>
+        <span class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v icon"></i></span>
         <ul class="dropdown-menu">
             <li><a data-id="{$LISTVIEW_ENTRY->getId()}" href="{$LISTVIEW_ENTRY->getFullDetailViewUrl()}">{vtranslate('LBL_DETAILS', $MODULE)}</a></li>
             {if $RECORD_ACTIONS}
diff --git a/layouts/v7/modules/Emails/resources/MassEdit.js b/layouts/v7/modules/Emails/resources/MassEdit.js
index a9ced971c20416f8454171f0515858d651654ffd..69df026f0cf6353b32db0bda67c222b738dfde3c 100644
--- a/layouts/v7/modules/Emails/resources/MassEdit.js
+++ b/layouts/v7/modules/Emails/resources/MassEdit.js
@@ -846,7 +846,7 @@ jQuery.Class("Emails_MassEdit_Js",{},{
 			this.calculateUploadFileSize();
 			this.registerSaveDraftOrSendEmailEvent();
 			var isCkeditorApplied = jQuery('#description').data('isCkeditorApplied');
-			if(isCkeditorApplied != true){
+			if(isCkeditorApplied != true && jQuery('#description').length > 0){
 				this.loadCkEditor(jQuery('#description').data('isCkeditorApplied',true));
 			}
 			this.registerSelectEmailTemplateEvent();
diff --git a/layouts/v7/modules/Mobile/simple/Vtiger/Detail.tpl b/layouts/v7/modules/Mobile/simple/Vtiger/Detail.tpl
index da387876a72105ec2b20f522f314440875255787..c3e3a759b56bfbee870d0e30c82d5edc9921946c 100644
--- a/layouts/v7/modules/Mobile/simple/Vtiger/Detail.tpl
+++ b/layouts/v7/modules/Mobile/simple/Vtiger/Detail.tpl
@@ -111,9 +111,9 @@
                 </md-tab>
                 <md-tab label="Related">
                     <div ng-if="relatedModules" style="height:75vh; overflow: scroll;">
-                        <md-list-item ng-repeat="(module , value) in relatedModules" ng-click="showRelatedList(module)">
-                            <p style="font-size: 13px;"><span style="font-size: 12px; color:#FF4068" class="vicon-{{module | lowercase | nospace}}"></span> &nbsp;  {{module}}</p>
-                            <p style="text-align:right; color:#0099FF">{{value}}</p>
+                        <md-list-item ng-repeat="(label, info) in relatedModules" ng-click="showRelatedList(info.relatedModule)">
+                            <p style="font-size: 13px;"><span style="font-size: 12px; color:#FF4068" class="vicon-{{info.relatedModule | lowercase | nospace}}"></span> &nbsp;  {{label}}</p>
+                            <p style="text-align:right; color:#0099FF">{{info.count}}</p>
                             <md-divider></md-divider>
                         </md-list-item>
                     </div>
diff --git a/layouts/v7/modules/Mobile/simple/Vtiger/Home.tpl b/layouts/v7/modules/Mobile/simple/Vtiger/Home.tpl
index e84354c98d43e7a1a3bdd3186a52a186e73b3218..e2739b77ae549daae5f30a5604c36af6c33d24fd 100644
--- a/layouts/v7/modules/Mobile/simple/Vtiger/Home.tpl
+++ b/layouts/v7/modules/Mobile/simple/Vtiger/Home.tpl
@@ -40,12 +40,11 @@
                 <div class="user-details">
                     <md-list-item class="md-1-line">
                     {/literal}
-                    <img src="../../{$TEMPLATE_WEBPATH}/resources/images/butler.jpg" class="md-avatar" alt="butler">
+                    <img src="../../{$TEMPLATE_WEBPATH}/resources/images/default_1.png" class="md-avatar" alt="user">
                     {literal}
                         <div class="md-list-item-text">
-                            <h5>{{userinfo.first_name + " "}}{{userinfo.last_name}}</h5>
-                            <!--p>{{userinfo.username}}</p>
-                            <p>{{userinfo.email}}</p-->
+                            <div>{{userinfo.first_name + " "}}{{userinfo.last_name}}</div>
+							<h5 style="margin: 0px;">{{userinfo.email}}</h5>
                         </div>
                     </md-list-item>
                 </div>
@@ -90,4 +89,4 @@
 </div>
 </section>
 {/literal}
-{include file="../Footer.tpl"}
\ No newline at end of file
+{include file="../Footer.tpl"}
diff --git a/layouts/v7/modules/Mobile/simple/Vtiger/SideMenu.tpl b/layouts/v7/modules/Mobile/simple/Vtiger/SideMenu.tpl
index 581c6a4af740ab0469833f19ec849e85302fe1d4..e35b8bc573e9c1d7e21ffbed44fb0e07e69269be 100644
--- a/layouts/v7/modules/Mobile/simple/Vtiger/SideMenu.tpl
+++ b/layouts/v7/modules/Mobile/simple/Vtiger/SideMenu.tpl
@@ -4,7 +4,7 @@
         <div class="user-details">
             <md-list-item class="md-1-line" style="margin:10px 0px">
             {/literal}
-            <img src="../../{$TEMPLATE_WEBPATH}/resources/images/default_1.png" class="md-avatar" alt="butler">
+            <img src="../../{$TEMPLATE_WEBPATH}/resources/images/default_1.png" class="md-avatar" alt="user">
             {literal}
                 <div class="md-list-item-text">
                     <small>{{userinfo.first_name + " "}}{{userinfo.last_name}}</small>
diff --git a/layouts/v7/modules/Mobile/simple/Vtiger/js/Detail.js b/layouts/v7/modules/Mobile/simple/Vtiger/js/Detail.js
index 02fbed0c106d857cb0b10d33a287b7704648cfda..8acf2fb808ff8227592b5efa0718e997898b4ae5 100644
--- a/layouts/v7/modules/Mobile/simple/Vtiger/js/Detail.js
+++ b/layouts/v7/modules/Mobile/simple/Vtiger/js/Detail.js
@@ -19,7 +19,9 @@ mobileapp.controller('VtigerDetailController', function ($scope, $api) {
     });
     
     $scope.gobacktoUrl = function(){
-        window.history.back();
+        //window.history.back();
+        // Binding DetailView back action to List view. (as Edit + Save puts back in wrong state)
+        window.location.href = (window.location.href.replace(/view=Detail/, "view=List"));
     };
     
     var _VTIGER_RESTRICTIONS = {
@@ -115,10 +117,7 @@ mobileapp.controller('VtigerDetailController', function ($scope, $api) {
         
         $api('fetchRecord', {mode:'getRelatedRecordCount', module:$scope.module, record:$scope.record}, function(er, re) {
             if(re){
-                $scope.relatedModules = {};
-                for(var key in re){
-                    $scope.relatedModules[key] = re[key].count;
-                }
+                $scope.relatedModules = re;
             }
         });
     };
diff --git a/layouts/v7/modules/Mobile/simple/Vtiger/js/Edit.js b/layouts/v7/modules/Mobile/simple/Vtiger/js/Edit.js
index 8e73c05f603d3686f7286b87aa10de38cfd76eab..eef413183dddf69eb55b8f4b4a52e63ab33bd61b 100644
--- a/layouts/v7/modules/Mobile/simple/Vtiger/js/Edit.js
+++ b/layouts/v7/modules/Mobile/simple/Vtiger/js/Edit.js
@@ -17,7 +17,11 @@ mobileapp.controller('VtigerEditController', function ($scope, $api, $mdToast, $
     $scope.editdata = [];
 	var _processFields = function(field, newrecord, value){
         if(newrecord){
-            field.raw = field.type.defaultValue;
+            if (typeof field.default != 'undefined') field.raw = field.default;
+            else if (typeof field.type.defaultValue != 'undefined') field.raw = field.type.defaultValue;
+
+			// Special case
+			if (field.type.name == 'owner' && field.mandatory && !field.raw) { field.raw = "19x" + $scope.userinfo.id; }
         }
         if(!newrecord && value){
             field.raw = value;
@@ -115,7 +119,13 @@ mobileapp.controller('VtigerEditController', function ($scope, $api, $mdToast, $
            $scope.loadFields();
        }
        else{
-           prepareCreateData(true);
+		   if ($scope.userinfo) {
+                prepareCreateData(true);
+           } else {
+               $scope.$root.$on('UserInfo.Changed', function(){
+                    prepareCreateData(true);
+               });
+           }
        }
    });
     
@@ -127,6 +137,7 @@ mobileapp.controller('VtigerEditController', function ($scope, $api, $mdToast, $
         $api('fetchRecord', {module: $scope.module, record: $scope.record, view_mode:'web'}, function (e, r) {
             if(r){
                 prepareCreateData(false, r);
+				$scope.record = r.record.id;
             }
         });
     };  
@@ -181,7 +192,7 @@ mobileapp.controller('VtigerEditController', function ($scope, $api, $mdToast, $
 				}
                 var toast = $mdToast.simple().content(message).position($scope.getToastPosition()).hideDelay(1000);
                 $mdToast.show(toast);
-                window.location.href = "index.php?module="+$scope.module+"&view=List&app="+$scope.selectedApp;
+                //window.location.href = "index.php?module="+$scope.module+"&view=List&app="+$scope.selectedApp;
             }
         });
     };
diff --git a/layouts/v7/modules/Settings/MailConverter/resources/MailConverter.js b/layouts/v7/modules/Settings/MailConverter/resources/MailConverter.js
index 38bc5d2477ab79ee568c01f7f233b09d394652ef..a15cbfd366f84e862427258f63427eeeffb04555 100644
--- a/layouts/v7/modules/Settings/MailConverter/resources/MailConverter.js
+++ b/layouts/v7/modules/Settings/MailConverter/resources/MailConverter.js
@@ -25,7 +25,7 @@ jQuery.Class('Settings_MailConverter_Index_Js', {
 	triggerDeleteRule: function (currentElement, url) {
 		var deleteElement = jQuery(currentElement);
 		app.helper.showConfirmationBox({'message': app.vtranslate('LBL_DELETE_CONFIRMATION')}).then(function () {
-			app.request.get({url:url}).then(function (err, data) {
+			app.request.post({url:url}).then(function (err, data) {
 				if (data) {
 					var closestBlock = deleteElement.closest('[data-blockid]');
 					var nextBlocks = closestBlock.nextAll('[data-blockid]');
@@ -182,4 +182,4 @@ jQuery.Class('Settings_MailConverter_Index_Js', {
 jQuery(document).ready(function () {
 	var mcInstance = Settings_MailConverter_Index_Js.mailConverterInstance = new Settings_MailConverter_Index_Js();
 	mcInstance.registerEvents();
-});
\ No newline at end of file
+});
diff --git a/layouts/v7/modules/Settings/ModuleManager/ImportUserModuleStep1.tpl b/layouts/v7/modules/Settings/ModuleManager/ImportUserModuleStep1.tpl
index 13381134496c99a03692e20c68397e2a27fa6062..c95c6eafbae4e73515249ba7f6dd33d89b11fa95 100644
--- a/layouts/v7/modules/Settings/ModuleManager/ImportUserModuleStep1.tpl
+++ b/layouts/v7/modules/Settings/ModuleManager/ImportUserModuleStep1.tpl
@@ -28,7 +28,7 @@
 						<div>
 							<input type="checkbox" name="acceptDisclaimer" /> &nbsp;&nbsp;<b>{vtranslate('LBL_ACCEPT_WITH_THE_DISCLAIMER', $QUALIFIED_MODULE)}</b>
 						</div>
-						<div style="margin-top: 15px;">
+						<div style="margin-top: 15px; display: none;">
 							<span name="proceedInstallation" class="fileUploadBtn btn btn-primary">
 								<span><i class="fa fa-laptop"></i> {vtranslate('Select from My Computer', $MODULE)}</span>
 								<input type="file" name="moduleZip" id="moduleZip" size="80px" data-validation-engine="validate[required, funcCall[Vtiger_Base_Validator_Js.invokeValidation]]"
@@ -49,4 +49,4 @@
 			</div>
 		</form>
 	</div>
-{/strip}
\ No newline at end of file
+{/strip}
diff --git a/layouts/v7/modules/Settings/ModuleManager/ImportUserModuleStep2.tpl b/layouts/v7/modules/Settings/ModuleManager/ImportUserModuleStep2.tpl
index b7f0a9caa5cc4542ef1d91dcbb145ee347ed1675..aeaa9eaad9a930ade199c58b9e56c9ce3a376234 100644
--- a/layouts/v7/modules/Settings/ModuleManager/ImportUserModuleStep2.tpl
+++ b/layouts/v7/modules/Settings/ModuleManager/ImportUserModuleStep2.tpl
@@ -62,9 +62,6 @@
 							{/if}
 							<br>
 							<div class="col-lg-12">
-								{if $MODULEIMPORT_EXISTS neq 'true'}
-									<input type="checkbox" class="acceptLicense"> {vtranslate('LBL_LICENSE_ACCEPT_AGREEMENT', $QUALIFIED_MODULE)}
-								{/if}&nbsp;
 								{if $MODULEIMPORT_EXISTS eq 'true' || $MODULEIMPORT_DIR_EXISTS eq 'true'}
 									{if $MODULEIMPORT_EXISTS eq 'true'}
 										<input type="hidden" name="module_import_file" value="{$MODULEIMPORT_FILE}">
@@ -106,4 +103,4 @@
 			</div>
 		</div>
 	</div>
-{/strip}
\ No newline at end of file
+{/strip}
diff --git a/layouts/v7/modules/Settings/ModuleManager/resources/ModuleManager.js b/layouts/v7/modules/Settings/ModuleManager/resources/ModuleManager.js
index 1755ccd9f575ca9c5058809d9788d9407f745d44..5bb6749fb149959cd5a89b74be0394d853d5a735 100644
--- a/layouts/v7/modules/Settings/ModuleManager/resources/ModuleManager.js
+++ b/layouts/v7/modules/Settings/ModuleManager/resources/ModuleManager.js
@@ -42,29 +42,35 @@ Vtiger_Index_Js('Settings_ModuleManager_List_Js', {
 		return aDeferred.promise();
 	},
 	registerEventsForImportFromZip: function (container) {
+		// Forcefully disable file-input and submit
+		var fileuploadWrap = container.find('.fileUploadBtn').parent();
+		var importFromZip = container.find('[name="importFromZip"]');
+		var moduleZip = container.find('[name="moduleZip"]');
+		var fileDetails = jQuery('#moduleFileDetails');
+
+		fileuploadWrap.hide();
+		importFromZip.attr('disabled', 'disabled');
+
 		container.on('change', '[name="acceptDisclaimer"]', function (e) {
 			var element = jQuery(e.currentTarget);
-			var importFromZip = container.find('[name="importFromZip"]');
-			var uploadedFile = jQuery('#moduleZip').val();
-			if (uploadedFile) {
-				jQuery('#moduleFileDetails').attr('title', uploadedFile).html(uploadedFile);
-			}
-			var disabledStatus = importFromZip.attr('disabled');
-			if ((element.is(':checked')) && (uploadedFile != '')) {
-				if (typeof disabledStatus != "undefined") {
-					importFromZip.removeAttr('disabled');
-				}
+			if (element.is(':checked')) {
+				fileuploadWrap.show();
 			} else {
-				if (typeof disabledStatus == "undefined") {
-					importFromZip.attr('disabled', "disabled");
-				}
+				fileuploadWrap.hide();
+				importFromZip.attr('disabled', 'disabled');
+				fileDetails.removeAttr('title').html('');
+				moduleZip.val('');
 			}
 		});
 
 		container.on('change', '[name="moduleZip"]', function (e) {
+			var uploadedFile = moduleZip.val();
+			if (uploadedFile) {
+				jQuery('#moduleFileDetails').attr('title', uploadedFile).html(uploadedFile);
+			}
 			var acceptDisclaimer = container.find('[name="acceptDisclaimer"]');
-			if (!acceptDisclaimer.is(':checked')) {
-				acceptDisclaimer.trigger('click');
+			if (acceptDisclaimer.is(':checked') && uploadedFile) {
+				importFromZip.removeAttr('disabled');
 			}
 		});
 
diff --git a/layouts/v7/modules/Settings/Roles/resources/Roles.js b/layouts/v7/modules/Settings/Roles/resources/Roles.js
index fae93e891a247e882ed251bd68b735cb637001a8..ec6b97cabdaa5743bd76fedba6ac455963542953 100644
--- a/layouts/v7/modules/Settings/Roles/resources/Roles.js
+++ b/layouts/v7/modules/Settings/Roles/resources/Roles.js
@@ -214,9 +214,11 @@ var Settings_Roles_Js = {
     /**
      * To register Profile Edit View Events
      */
+	_registeredProfileEvents: false,
     registerProfileEvents : function() {
-        if(typeof window['Settings_Profiles_Edit_Js'] != 'undefined'){
+        if(!this._registeredProfileEvents && typeof window['Settings_Profiles_Edit_Js'] != 'undefined'){
             var instance = new Settings_Profiles_Edit_Js();
+			this._registeredProfileEvents = true;
         }
     },
 	
@@ -397,4 +399,4 @@ Vtiger.Class("Settings_Roles_Edit_Js",{},{
 	addComponents : function() {
 		this.addModuleSpecificComponent('Index','Vtiger',app.getParentModuleName());
 	}
-});
\ No newline at end of file
+});
diff --git a/layouts/v7/modules/Settings/Vtiger/OutgoingServerEdit.tpl b/layouts/v7/modules/Settings/Vtiger/OutgoingServerEdit.tpl
index dd97f9ec0065524ba55965f349a21f09d678222e..2f99db328f7b2155c28873a96c8f22d81872afb4 100644
--- a/layouts/v7/modules/Settings/Vtiger/OutgoingServerEdit.tpl
+++ b/layouts/v7/modules/Settings/Vtiger/OutgoingServerEdit.tpl
@@ -29,6 +29,9 @@
 					</div>
 					<div class="block">
 						<div>
+							<div class="btn-group pull-right">
+								<button class="btn t-btn resetButton" type="button" title="{vtranslate('LBL_RESET_TO_DEFAULT', $QUALIFIED_MODULE)}"><strong>{vtranslate('LBL_RESET_TO_DEFAULT', $QUALIFIED_MODULE)}</strong></button>
+							</div>
 							<h4>{vtranslate('LBL_MAIL_SERVER_SMTP', $QUALIFIED_MODULE)}</h4>
 						</div>
 						<hr>
@@ -86,4 +89,4 @@
 			</form>
 		</div>
 	</div>
-{/strip}
\ No newline at end of file
+{/strip}
diff --git a/layouts/v7/modules/Settings/Workflows/Tasks/VTSMSTask.tpl b/layouts/v7/modules/Settings/Workflows/Tasks/VTSMSTask.tpl
index 53e58c8a2b93e2ed0411c647d50cedfbf0a9b651..9241c6696ee9f5fdac77a98b59c276484b59687a 100644
--- a/layouts/v7/modules/Settings/Workflows/Tasks/VTSMSTask.tpl
+++ b/layouts/v7/modules/Settings/Workflows/Tasks/VTSMSTask.tpl
@@ -33,7 +33,8 @@
             <div class="row form-group">
                 <div class="col-lg-2">{vtranslate('LBL_ADD_FIELDS',$QUALIFIED_MODULE)}</div>
                 <div class="col-lg-10">
-                    <select class="select2 task-fields" style="min-width: 150px;">
+                    <select class="select2 task-fields" style="min-width: 150px;" data-placeholder="{vtranslate('LBL_SELECT_FIELDS', $QUALIFIED_MODULE)}">
+						<option></option>
                         {$ALL_FIELD_OPTIONS}
                     </select>	
                 </div>
diff --git a/layouts/v7/modules/Vtiger/NotAccessible.tpl b/layouts/v7/modules/Vtiger/NotAccessible.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..637173bb1c2fce14e8206ee36bf0ff1e8c5ed0e9
--- /dev/null
+++ b/layouts/v7/modules/Vtiger/NotAccessible.tpl
@@ -0,0 +1,20 @@
+{*+**********************************************************************************
+* The contents of this file are subject to the vtiger CRM Public License Version 1.1
+* ("License"); You may not use this file except in compliance with the License
+* The Original Code is: vtiger CRM Open Source
+* The Initial Developer of the Original Code is vtiger.
+* Portions created by vtiger are Copyright (C) vtiger.
+* All Rights Reserved.
+************************************************************************************}
+<div id="sendSmsContainer" class='modal-xs modal-dialog'>
+    <div class = "modal-content">
+        {include file="ModalHeader.tpl"|vtemplate_path:$MODULE TITLE=$TITLE}
+
+        <div class="modal-body">
+        	{$BODY}
+    	</div>
+
+    	<div class="modal-footer">
+    	</div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/layouts/v7/modules/Vtiger/partials/Menubar.tpl b/layouts/v7/modules/Vtiger/partials/Menubar.tpl
index 646efc9082143a1d81bc7f380f3dc994e4007958..5b2db9be5a0952b87e46efcb9e8ab2809e81db0f 100644
--- a/layouts/v7/modules/Vtiger/partials/Menubar.tpl
+++ b/layouts/v7/modules/Vtiger/partials/Menubar.tpl
@@ -7,6 +7,7 @@
 * All Rights Reserved.
 ************************************************************************************}
 
+{if $MENU_STRUCTURE}
 {assign var="topMenus" value=$MENU_STRUCTURE->getTop()}
 {assign var="moreMenus" value=$MENU_STRUCTURE->getMore()}
 
@@ -23,3 +24,4 @@
 		</ul>
 	{/foreach}
 </div>
+{/if}
diff --git a/layouts/v7/modules/Vtiger/resources/Detail.js b/layouts/v7/modules/Vtiger/resources/Detail.js
index a9322c60e2acaf39a0adf98e4065116dceef34ad..8a61e3190b4f4cf7af036c368a0cc13eb8ac191c 100644
--- a/layouts/v7/modules/Vtiger/resources/Detail.js
+++ b/layouts/v7/modules/Vtiger/resources/Detail.js
@@ -1487,7 +1487,7 @@ Vtiger.Class("Vtiger_Detail_Js",{
 		if(typeof contentHolder === 'undefined') {
 			contentHolder = this.getContentHolder();
 		}
-		contentHolder.off('click', 'clearReferenceSelection');
+		contentHolder.off('click', '.clearReferenceSelection');
 		contentHolder.on('click','.clearReferenceSelection',function(e){
 			e.preventDefault();
 			var element = jQuery(e.currentTarget);
diff --git a/layouts/v7/modules/Vtiger/resources/ListSidebar.js b/layouts/v7/modules/Vtiger/resources/ListSidebar.js
index f26c234e4fa3e52681994c5d58529d14be192e33..a8ecae4d28011dbb83ca4e5b77ff7b09bbdef55d 100644
--- a/layouts/v7/modules/Vtiger/resources/ListSidebar.js
+++ b/layouts/v7/modules/Vtiger/resources/ListSidebar.js
@@ -58,6 +58,7 @@ Vtiger.Class('Vtiger_ListSidebar_Js',{},{
         
         this.registerFilterSeach();
         filters.on('click','.listViewFilter', function(e){
+			e.preventDefault();
             var targetElement = jQuery(e.target);
             if(targetElement.is('.dropdown-toggle') || targetElement.closest('ul').hasClass('dropdown-menu') ) return;
             var element = jQuery(e.currentTarget);
@@ -283,4 +284,4 @@ Vtiger.Class('Vtiger_ListSidebar_Js',{},{
             }
         });
     }
-});
\ No newline at end of file
+});
diff --git a/layouts/v7/modules/Vtiger/resources/validation.js b/layouts/v7/modules/Vtiger/resources/validation.js
index c2e44ee3716797662277b153455ac9af3e4b67de..e870d8cbe1991076dceec7c148ba512038c0c96c 100644
--- a/layouts/v7/modules/Vtiger/resources/validation.js
+++ b/layouts/v7/modules/Vtiger/resources/validation.js
@@ -62,14 +62,15 @@ jQuery.validator.addMethod("double", function(value, element, params) {
 
 
 jQuery.validator.addMethod("WholeNumber", function(value, element, params) {
-	var regex= /[+]/;
-	if(value.match(regex)){
-		return;
+		var regex= /[^+\-0-9.]+/; // not number?
+		
+		if(value.match(regex)){
+			return false;
+		}
 
-		if((value % 1) != 0){
+		if((value % 1) != 0){  // is decimal?
 			return false;
 		}
-	}
 		return true;
 	}, jQuery.validator.format(app.vtranslate('INVALID_NUMBER'))
 );
@@ -682,11 +683,11 @@ jQuery.validator.addMethod("percentage", function(value, element, params){
 		if(spacePattern.test(decimalSeparator)) {
 			strippedValue = strippedValue.replace(/ /g, '');
 		}
-		if(isNaN(strippedValue) || strippedValue < 0) {
+		if(isNaN(strippedValue)) {
 			return false;
 		}
 		return true;
-}, jQuery.validator.format(app.vtranslate('JS_ACCEPT_POSITIVE_NUMBER')));
+}, jQuery.validator.format(app.vtranslate('JS_PLEASE_ENTER_VALID_VALUE')));
 
 jQuery.validator.addMethod("inventory_percentage", function(value, element, params){
 	var valid = jQuery.validator.methods.percentage.call(this,value,element,params);
diff --git a/layouts/v7/modules/Vtiger/uitypes/Owner.tpl b/layouts/v7/modules/Vtiger/uitypes/Owner.tpl
index 99ac2b0ac0f8f048274fd27d6d86d4facb939b10..2b3905b9bb5a5eb58ad3a40d73af14a4122db92b 100644
--- a/layouts/v7/modules/Vtiger/uitypes/Owner.tpl
+++ b/layouts/v7/modules/Vtiger/uitypes/Owner.tpl
@@ -31,9 +31,10 @@
                 data-specific-rules='{ZEND_JSON::encode($FIELD_INFO["validator"])}'
             {/if}
             >
+		{if $FIELD_MODEL->isCustomField() || $VIEW_SOURCE eq 'MASSEDIT'} <option value="">{vtranslate('LBL_SELECT_OPTION','Vtiger')}</option> {/if}
 		<optgroup label="{vtranslate('LBL_USERS')}">
 			{foreach key=OWNER_ID item=OWNER_NAME from=$ALL_ACTIVEUSER_LIST}
-                    <option value="{$OWNER_ID}" data-picklistvalue= '{$OWNER_NAME}' {if $FIELD_VALUE eq $OWNER_ID} selected {/if}
+                    <option value="{$OWNER_ID}" data-picklistvalue= '{$OWNER_NAME}' {if $FIELD_VALUE eq $OWNER_ID && $VIEW_SOURCE neq 'MASSEDIT'} selected {/if}
 						{if array_key_exists($OWNER_ID, $ACCESSIBLE_USER_LIST)} data-recordaccess=true {else} data-recordaccess=false {/if}
 						data-userId="{$CURRENT_USER_ID}">
                     {$OWNER_NAME}
@@ -51,4 +52,4 @@
 	</select>
 {/if}
 {* TODO - UI type 52 needs to be handled *}
-{/strip}
\ No newline at end of file
+{/strip}
diff --git a/layouts/v7/modules/Vtiger/uitypes/OwnerGroup.tpl b/layouts/v7/modules/Vtiger/uitypes/OwnerGroup.tpl
index 20bf89d4fd45d0dd0c70b77d537b21f246926154..7584b5402b9539dd27c62716936f4931ed880a73 100644
--- a/layouts/v7/modules/Vtiger/uitypes/OwnerGroup.tpl
+++ b/layouts/v7/modules/Vtiger/uitypes/OwnerGroup.tpl
@@ -25,10 +25,10 @@
 		{/if}>
 		<option value="">{vtranslate('LBL_SELECT_OPTION','Vtiger')}</option>
 		{foreach key=OWNER_ID item=OWNER_NAME from=$ALL_ACTIVEGROUP_LIST}
-			<option value="{$OWNER_ID}" data-picklistvalue='{$OWNER_NAME}' {if $FIELD_MODEL->get('fieldvalue') eq $OWNER_ID} selected {/if}
+			<option value="{$OWNER_ID}" data-picklistvalue='{$OWNER_NAME}' {if $VIEW_SOURCE neq 'MASSEDIT' && $FIELD_MODEL->get('fieldvalue') eq $OWNER_ID} selected {/if}
 					{if array_key_exists($OWNER_ID, $ACCESSIBLE_GROUP_LIST)} data-recordaccess=true {else} data-recordaccess=false {/if} >
 				{$OWNER_NAME}
 			</option>
 		{/foreach}
 	</select>
-{/strip}
\ No newline at end of file
+{/strip}
diff --git a/layouts/v7/skins/contact/style.css b/layouts/v7/skins/contact/style.css
index 87eccfbebdfdd00cdd836b5bcc12b6fd80333e84..7c75c0bf66a1d6bd46864c5857782f4245ed7bbf 100644
--- a/layouts/v7/skins/contact/style.css
+++ b/layouts/v7/skins/contact/style.css
@@ -1,7 +1,9 @@
 @font-face {
   font-family: 'Oswald';
   src: url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.eot');
-  src: url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.eot?#iefix') format('embedded-opentype'), url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.woff') format('woff'), url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.ttf') format('truetype'), url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.svg#Oswald') format('svg');
+  /* IE9 Compat Modes */
+  src: url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.svg#Oswald') format('svg');
+  /* Legacy iOS */
   font-weight: normal;
   font-style: normal;
   text-rendering: optimizeLegibility;
@@ -15,27 +17,37 @@ a:active {
 @font-face {
   font-family: 'OpenSans-Regular';
   src: url('../fonts/OpenSans/Regular/OpenSans-Regular.eot');
-  src: url('../fonts/OpenSans/Regular/OpenSans-Regular.ttf') format('truetype'), url('../fonts/OpenSans/Regular/OpenSans-Regular.eot?#iefix') format('embedded-opentype'), url('../fonts/OpenSans/Regular/OpenSans-Regular.woff2') format('woff2'), url('../fonts/OpenSans/Regular/OpenSans-Regular.woff') format('woff'), url('../fonts/OpenSans/Regular/OpenSans-Regular.svg#svgFontName') format('svg');
+  /* IE9 Compat Modes */
+  src: url('../fonts/OpenSans/Regular/OpenSans-Regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/OpenSans/Regular/OpenSans-Regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/OpenSans/Regular/OpenSans-Regular.woff2') format('woff2'), /* Super Modern Browsers */ url('../fonts/OpenSans/Regular/OpenSans-Regular.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/OpenSans/Regular/OpenSans-Regular.svg#svgFontName') format('svg');
+  /* Legacy iOS */
 }
 @font-face {
   font-family: 'OpenSans-Semibold';
   src: url('../fonts/OpenSans/Semibold/OpenSans-Semibold.eot');
-  src: url('../fonts/OpenSans/Semibold/OpenSans-Semibold.ttf') format('truetype'), url('../fonts/OpenSans/Semibold/OpenSans-Semibold.eot?#iefix') format('embedded-opentype'), url('../fonts/OpenSans/Semibold/OpenSans-Semibold.woff2') format('woff2'), url('../fonts/OpenSans/Semibold/OpenSans-Semibold.woff') format('woff'), url('../fonts/OpenSans/Semibold/OpenSans-Semibold.svg#svgFontName') format('svg');
+  /* IE9 Compat Modes */
+  src: url('../fonts/OpenSans/Semibold/OpenSans-Semibold.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/OpenSans/Semibold/OpenSans-Semibold.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/OpenSans/Semibold/OpenSans-Semibold.woff2') format('woff2'), /* Super Modern Browsers */ url('../fonts/OpenSans/Semibold/OpenSans-Semibold.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/OpenSans/Semibold/OpenSans-Semibold.svg#svgFontName') format('svg');
+  /* Legacy iOS */
 }
 @font-face {
   font-family: 'ProximaNova-Regular';
-  src: url('../fonts/ProximanovaWebfont/ProximaNova-Regular.ttf') format('truetype'), url('../fonts/ProximanovaWebfont/ProximaNova-Regular.woff') format('woff'), url('../fonts/ProximanovaWebfont/ProximaNova-Regular.eot?#iefix') format('embedded-opentype');
+  src: url('../fonts/ProximanovaWebfont/ProximaNova-Regular.ttf') format('truetype'), url('../fonts/ProximanovaWebfont/ProximaNova-Regular.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/ProximanovaWebfont/ProximaNova-Regular.eot?#iefix') format('embedded-opentype');
+  /* IE6-IE8 */
+  /* Safari, Android, iOS */
   font-style: normal;
   font-weight: normal;
   text-rendering: optimizeLegibility;
 }
 @font-face {
   font-family: 'ProximaNova-Semibold';
-  src: url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.ttf') format('truetype'), url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.woff') format('woff'), url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.eot?#iefix') format('embedded-opentype');
+  src: url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.eot?#iefix') format('embedded-opentype');
+  /* IE6-IE8 */
   font-style: normal;
   font-weight: normal;
   text-rendering: optimizeLegibility;
 }
+/**********************************/
+/************ Layout **************/
+/**********************************/
 html {
   height: 100%;
   overflow-y: auto;
@@ -102,6 +114,7 @@ body {
 @media (min-width: 992px) {
   .global-nav .logo-container {
     display: inline-block;
+    width: 150px;
     z-index: 2;
     padding-left: 6%;
     margin-top: 1px;
@@ -113,11 +126,13 @@ body {
     position: absolute;
     width: 100%;
     height: 42px;
+    /*        border-top:1px solid #ddd;*/
     border-bottom: 1px solid #ddd;
   }
   .app-nav .module-action-bar .module-action-content {
     background: #FBFBFB;
     height: 41px;
+    /*        border-bottom: 1px solid #eee;*/
   }
   .app-nav .module-action-bar .module-action-content .navbar-right {
     margin-right: 0;
@@ -163,7 +178,7 @@ body {
     padding-left: 0;
   }
 }
-.btn-toolbar >.btn-group:first-child {
+.btn-toolbar > .btn-group:first-child {
   margin-left: 5px;
 }
 .vt-notification {
@@ -196,15 +211,19 @@ body {
 .vt-notification [data-notify="message"] {
   color: #eaeaea;
 }
+/**********************************/
+/******** Navigation styles *******/
+/**********************************/
 .company-logo {
   height: 40px;
+  width: 150px;
   margin: 0 0;
   display: inline-block;
   margin-left: 1px;
 }
 .company-logo img {
-  max-height: 100%;
-  max-width: 100%;
+  height: 100%;
+  width: auto;
 }
 .navbar .fa {
   font-size: 15px;
@@ -214,10 +233,13 @@ body {
   font-size: 16px;
   position: relative;
 }
+/*.module-action-bar .module-action-content #appnav{
+    padding-top:5px;
+}*/
 .global-nav .navbar-nav > li div a {
   padding: 15px;
 }
-.global-nav>ul {
+.global-nav > ul {
   margin-right: 20px;
 }
 .global-nav .search-links-container {
@@ -267,26 +289,28 @@ body {
     float: right;
     height: 42px;
   }
-  .module-action-bar .navbar-right .nav>li {
+  .module-action-bar .navbar-right .nav > li {
     display: inline-block;
   }
-  .module-action-bar .navbar-right .nav>li a {
+  .module-action-bar .navbar-right .nav > li a {
     padding: 0 10px;
   }
   .global-nav .logo-container {
     border-bottom: 0;
+    width: 150px;
   }
 }
 @media (max-width: 991px) {
   .global-nav .logo-container {
     border-bottom: 0;
+    width: 150px;
   }
   .notificationMessageHolder {
     padding-left: 45%;
   }
 }
 @media (min-width: 991px) {
-  .nav>li>a.qc-button {
+  .nav > li > a.qc-button {
     padding: 2px 3px;
     margin-top: 13px;
     margin-right: 15px;
@@ -294,7 +318,7 @@ body {
     color: #fff;
     border-radius: 20px;
   }
-  .nav>li>a.qc-button span {
+  .nav > li > a.qc-button span {
     vertical-align: top;
   }
 }
@@ -313,6 +337,7 @@ body {
   width: 100%;
   height: 100%;
 }
+/** App Nav Styles */
 .active-app-title {
   white-space: nowrap;
   font-family: Oswald, "OpenSans-Semibold", "Helvetica Neue", Helvetica, sans-serif;
@@ -367,7 +392,9 @@ body {
   height: 42px;
   text-align: center;
   line-height: 42px;
+  /*    background-color: #2c3b49;*/
   color: #ffffff;
+  /*border-bottom: 1px solid #272B46;*/
 }
 .app-nav .app-indicator-icon-container .app-indicator-icon {
   font-size: 24px;
@@ -479,16 +506,16 @@ body {
   right: -4px;
 }
 #overlayPageContent .mCSB_scrollTools,
-#overlayPageContent .mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar,
-#overlayPageContent .mCSB_scrollTools .mCSB_buttonUp,
-#overlayPageContent .mCSB_scrollTools .mCSB_buttonDown,
-#overlayPageContent .mCSB_scrollTools .mCSB_buttonLeft,
-#overlayPageContent .mCSB_scrollTools .mCSB_buttonRight,
 .app-list .mCSB_scrollTools,
+#overlayPageContent .mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar,
 .app-list .mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar,
+#overlayPageContent .mCSB_scrollTools .mCSB_buttonUp,
 .app-list .mCSB_scrollTools .mCSB_buttonUp,
+#overlayPageContent .mCSB_scrollTools .mCSB_buttonDown,
 .app-list .mCSB_scrollTools .mCSB_buttonDown,
+#overlayPageContent .mCSB_scrollTools .mCSB_buttonLeft,
 .app-list .mCSB_scrollTools .mCSB_buttonLeft,
+#overlayPageContent .mCSB_scrollTools .mCSB_buttonRight,
 .app-list .mCSB_scrollTools .mCSB_buttonRight {
   -webkit-transition: none;
   transition: none;
@@ -700,6 +727,7 @@ a.menu-item:hover {
   width: 0px;
   overflow: hidden;
 }
+/* User Logout */
 .logout-content {
   padding: 10px;
   width: 350px;
@@ -754,6 +782,9 @@ a.menu-item:hover {
 .app-settings {
   background: #FFFFFF;
 }
+/*************************************************/
+/******** View styles (List/Edit/Detail..) *******/
+/*************************************************/
 .viewContent .content-area {
   padding-left: 50px;
 }
@@ -791,7 +822,6 @@ a.menu-item:hover {
 .fieldValue .value {
   max-width: 85%;
   display: inline-block;
-  word-break: break-word;
 }
 .modal-header button.close {
   padding: 0;
@@ -865,6 +895,9 @@ input[type="password"].inputElement {
   padding-right: 20px;
   padding-left: 20px;
 }
+/**********************************/
+/**** Side vertical Nav styles ****/
+/**********************************/
 .module-nav {
   background: #fff;
   z-index: 1004;
@@ -880,6 +913,9 @@ input[type="password"].inputElement {
   left: 0;
   transition: 0s width;
 }
+.module-nav:hover {
+  /*z-index: 1001;*/
+}
 .modules-menu ul {
   list-style: none;
   margin-left: 0;
@@ -914,7 +950,7 @@ input[type="password"].inputElement {
   float: left;
   font-size: 20px;
 }
-.modules-menu ul li a>span {
+.modules-menu ul li a > span {
   margin-left: 10px;
   vertical-align: middle;
   font-size: 13px;
@@ -954,6 +990,7 @@ input[type="password"].inputElement {
   width: 100%;
   left: 0%;
 }
+/** Lists Menu in Side bar */
 .module-filters .settings-sidebar,
 .module-filters .sidebar-container {
   padding: 0 12px;
@@ -987,6 +1024,7 @@ input[type="password"].inputElement {
 .lists-menu-container hr {
   margin: 5px 0;
 }
+/* mScrollbar customization for lists widget */
 .lists-menu-container .menu-scroller .mCSB_scrollTools {
   width: 13px;
 }
@@ -998,8 +1036,10 @@ input[type="password"].inputElement {
 .modules-menu .mCSB_scrollTools .mCSB_draggerContainer {
   left: 8px;
 }
+/* Customization ends */
 .lists-menu-container .list-menu-content .more-less-link {
   color: #fff;
+  /*text-decoration: none;*/
 }
 .lists-menu-container .list-menu-content .sub-header {
   color: #ddd;
@@ -1104,9 +1144,11 @@ input[type="password"].inputElement {
 .common-links-container > div a {
   color: #fff;
 }
+/*Search Container styles */
 .search-container {
   min-height: 300px;
   position: absolute;
+  /*z-index: 1030;*/
   width: 100%;
   top: 0;
   background: #FBFBFB;
@@ -1125,6 +1167,7 @@ input[type="password"].inputElement {
 .footer p {
   margin: 5px 0;
 }
+/*** Utilities ***/
 .showElement {
   display: block !important;
   height: 100%;
@@ -1247,11 +1290,11 @@ ul.unstyled {
 }
 .emptyRecordsDiv .emptyRecordsContent {
   display: inline-block;
-  font-size: 16px;
   left: 50%;
   margin-left: -25%;
   position: absolute;
   width: 50%;
+  font-size: 16px;
 }
 .textOverflowEllipsis {
   overflow: hidden;
@@ -1276,6 +1319,9 @@ ul.unstyled {
 .removeNoFileChosen {
   color: transparent !important;
 }
+/***********************************
+**********Button Styles**********
+***********************************/
 .module-buttons-container {
   float: right;
   margin-right: 10px;
@@ -1297,6 +1343,7 @@ ul.unstyled {
   margin: 4px 2px;
   border-radius: 2px;
   border: 1px solid #ddd;
+  text-transform: uppercase;
   color: #666;
   background: #fff;
 }
@@ -1317,6 +1364,9 @@ ul.unstyled {
   color: #FFFFFF !important;
   background: #5bc0de !important;
 }
+/***********************************
+**********List View Styles**********
+***********************************/
 .fa.pull-left {
   margin-right: 0;
 }
@@ -1351,7 +1401,7 @@ ul.unstyled {
   font-size: 20px;
 }
 .listview-pagination .disabled {
-  color: rgba(0,0,0,0.2);
+  color: rgba(0, 0, 0, 0.2);
 }
 .listview-pagination .disabled:hover {
   cursor: default;
@@ -1379,6 +1429,8 @@ ul.unstyled {
 .listview-table {
   margin-bottom: 0;
   border-top: 0;
+  /* Horizontal scroll will not work if table layout Fixed */
+  /*    table-layout: fixed;*/
 }
 .listview-table tr td,
 .listview-table tr th {
@@ -1408,7 +1460,7 @@ ul.unstyled {
   width: 100%;
 }
 .listViewEntries .relatedListEntryValues .fieldValue .value,
-.listViewEntries  .listViewEntryValue .fieldValue .value {
+.listViewEntries .listViewEntryValue .fieldValue .value {
   vertical-align: middle;
   width: 100%;
   display: inline-block;
@@ -1423,7 +1475,7 @@ ul.unstyled {
 }
 .listview-table-norecords .table-actions,
 .listview-table .table-actions {
-  width: 120px;
+  width: 110px;
   font-size: 15px;
   color: #555;
   margin-left: 7px;
@@ -1489,13 +1541,13 @@ input[type=checkbox]:checked {
   vertical-align: middle;
   display: table-cell;
 }
-.listview-table  tr.searchRow th {
+.listview-table tr.searchRow th {
   padding: 5px 3px;
 }
-.listview-table  tr.searchRow th.inline-search-btn {
+.listview-table tr.searchRow th.inline-search-btn {
   padding: 3px 10px;
 }
-.listview-table  tr.searchRow th.inline-search-btn button {
+.listview-table tr.searchRow th.inline-search-btn button {
   text-align: center;
   width: 85%;
   text-shadow: none;
@@ -1523,6 +1575,18 @@ input[type=checkbox]:checked {
   background-color: #FFEEEE !important;
   background-image: none !important;
 }
+/*.floatThead-wrapper .table-container{
+    z-index: 0 !important;
+}*/
+/* List view bottom fixed scroll */
+/*.bottom-fixed-scroll{
+    height: 14px;
+    position: relative;
+    top: -15px;
+    overflow-x: auto;
+    overflow-y: hidden;
+    width: 100%;
+}*/
 .scroller-div {
   height: 1px;
 }
@@ -1644,12 +1708,12 @@ input[type=checkbox]:checked {
 #listColumnFilterContainer .disabled i {
   color: #ccc;
 }
+/**********************************
+**********Detail View Styles**********
+**********************************/
 .detailViewButtoncontainer {
   padding-top: 5px;
 }
-.detailViewButtoncontainer button.btn {
-  margin: 0px 1px !important;
-}
 .detailview-header .recordBasicInfo > .info-row {
   margin-bottom: 4px;
 }
@@ -1730,9 +1794,6 @@ th {
   margin-top: 3%;
   margin-right: 2%;
 }
-.overlayDetailHeader button.btn {
-  margin: 0px 1px !important;
-}
 .referencefield-wrapper .createReferenceRecord {
   float: left;
   margin-left: 5px;
@@ -1972,10 +2033,10 @@ th {
   z-index: 1030;
 }
 .overlay-container-60 {
-  margin-left: 42px;
+  margin-left: 42px ;
 }
 .overlay-container-300 {
-  margin-left: 230px;
+  margin-left: 230px ;
 }
 .overlayPageContent {
   background: #FFFFFF;
@@ -2098,6 +2159,9 @@ th {
   height: 26px;
   line-height: 25px;
 }
+/**********************************
+**********Summary View Styles******
+**********************************/
 .summary-table {
   width: 100%;
   table-layout: fixed;
@@ -2218,33 +2282,33 @@ th {
   opacity: 1;
   cursor: pointer;
 }
-.details.row >form .social-media-toggle {
+.details.row > form .social-media-toggle {
   position: absolute;
   right: -15px;
   display: inline-block;
   width: 500px;
   border-left: 0px;
 }
-.details.row >form .social-media-widget {
+.details.row > form .social-media-widget {
   border-left: 1px solid #ddd;
   border-bottom: 1px solid #ddd;
   height: 100%;
   background: white;
 }
-.details.row >form div[class*="col-"].resizable-summary-view {
+.details.row > form div[class*="col-"].resizable-summary-view {
   padding-left: 0;
   padding-right: 0px;
 }
-.details.row >form>div[class*="col-"],
-.details.row >form .resizable-summary-view div[class*="col-"] {
+.details.row > form > div[class*="col-"],
+.details.row > form .resizable-summary-view div[class*="col-"] {
   padding-right: 0;
   padding: 0px 5px;
 }
-.details.row >form>div[class*="col-"]:first-child,
-.details.row >form .left-block {
+.details.row > form > div[class*="col-"]:first-child,
+.details.row > form .left-block {
   padding-left: 0 !important;
 }
-.details.row >form>div[class*="col-"]:last-child {
+.details.row > form > div[class*="col-"]:last-child {
   padding-right: 0;
 }
 .summaryWidgetContainer .noContent {
@@ -2257,6 +2321,9 @@ th {
 .caseReplyArea .nav > li {
   padding: 0 10px;
 }
+/**********************************
+**********Edit View Styles*******
+**********************************/
 .main-container .editViewModNavigator.module-nav,
 .editViewModNavigator .mod-switcher-container,
 .editViewModNavigator .modules-menu {
@@ -2297,7 +2364,7 @@ th {
   width: 100%;
 }
 .editViewContents .input-group {
-  width: 229px;
+  width: 208px;
   float: left;
 }
 .input-group.inputElement .input-group-addon {
@@ -2376,6 +2443,9 @@ th {
   z-index: 1000;
   padding: 7px;
 }
+/**********************************
+**********Advance Search styles**********
+**********************************/
 .op0.fadeInx {
   opacity: 1;
 }
@@ -2448,7 +2518,11 @@ th {
 }
 .btn + input {
   margin-left: 5px;
+  /*    margin-top : 3px;*/
 }
+/**********************************
+**********Extension Store Styles**********
+**********************************/
 .extensionstore .app-trigger {
   width: 98%;
 }
@@ -2479,6 +2553,9 @@ th {
 .extensionContents .extensionError {
   color: #F10404;
 }
+/**********************************
+**********Extension Store Nav Bar**********
+**********************************/
 .tabbable-line > .nav-tabs {
   border: none;
   margin: 0px;
@@ -2547,6 +2624,9 @@ th {
 .extensionContents .listview-table {
   width: 100%;
 }
+/*******************************************
+******Detail View related list styles*******
+********************************************/
 .relatedContents .listViewContentHeaderValues:hover {
   text-decoration: none;
   color: #333;
@@ -2604,6 +2684,9 @@ th {
 .relatedViewActions .btn-group {
   margin-right: 15px;
 }
+/*******************************************
+****************** Modal *******************
+********************************************/
 .modal-header {
   padding: 5px 15px;
   background: #596875;
@@ -2631,6 +2714,7 @@ th {
   width: 100%;
   float: left;
   background: #596875;
+  /*    height: 100%;*/
 }
 .settings-menu {
   display: inline-block;
@@ -2647,7 +2731,7 @@ th {
   cursor: n-resize;
 }
 .settings-menu-items {
-  box-shadow: 0 1px 1px rgba(0,0,0,0.05);
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
   margin-bottom: 10px;
   text-align: justify;
 }
@@ -2765,9 +2849,6 @@ th {
 .active .stepNum {
   color: #FFFFFF;
 }
-.mailBoxEditDiv .crumbs li {
-  width: 22%;
-}
 .stepNum {
   display: inline-block;
   padding: 0 5px;
@@ -2776,6 +2857,7 @@ th {
   vertical-align: middle;
   color: #3399ff;
 }
+/* .squaredFour */
 .squaredFour {
   width: 20px;
   position: relative;
@@ -2789,9 +2871,9 @@ th {
   top: 0;
   left: 0;
   background: #fcfff4;
-  background: linear-gradient(top,#fcfff4 0%,#dfe5d7 40%,#b3bead 100%);
+  background: linear-gradient(top, #fcfff4 0%, #dfe5d7 40%, #b3bead 100%);
   border-radius: 4px;
-  box-shadow: inset 0px 1px 1px white, 0px 1px 3px rgba(0,0,0,0.5);
+  box-shadow: inset 0px 1px 1px white, 0px 1px 3px rgba(0, 0, 0, 0.5);
 }
 .squaredFour label:after {
   content: '';
@@ -2819,13 +2901,16 @@ th {
 .importBlockContainer {
   color: #596875;
 }
+/******************************************* 
+************* Social Buttons *************** 
+********************************************/
 .btn-block + .btn-block {
   margin-top: 5px;
 }
 .btn-google-plus {
   color: #FFFFFF !important;
   background-color: #DD4B39;
-  border-color: rgba(0,0,0,0.2);
+  border-color: rgba(0, 0, 0, 0.2);
 }
 .btn-social {
   position: relative;
@@ -2844,15 +2929,18 @@ th {
   line-height: 34px;
   font-size: 1.6em;
   text-align: center;
-  border-right: 1px solid rgba(0,0,0,0.2);
+  border-right: 1px solid rgba(0, 0, 0, 0.2);
 }
+/******************************************* 
+************* Updates Timeline *************** 
+********************************************/
 .recentActivitiesContainer .history {
   margin: 0 auto;
   padding: 20px 20px 1px;
   max-width: 100%;
   overflow-x: visible;
-  -webkit-transition: opacity .2s ease-out;
-  transition: opacity .2s ease-out;
+  -webkit-transition: opacity 0.2s ease-out;
+  transition: opacity 0.2s ease-out;
 }
 .updates_timeline {
   padding-top: 20px;
@@ -2861,6 +2949,7 @@ th {
   padding: 0;
   list-style: none;
 }
+/* The line */
 .updates_timeline:before {
   content: '';
   position: absolute;
@@ -2879,6 +2968,7 @@ th {
   min-height: 40px;
   z-index: 2;
 }
+/* Left Content(Time) */
 .updates_timeline > li .update_time {
   position: absolute;
   margin: 0;
@@ -2890,6 +2980,7 @@ th {
   font-size: 15px;
   font-style: italic;
 }
+/* Right content(Update info) */
 .updates_timeline > li .update_info {
   padding: 10px 10px 1px;
   display: block;
@@ -2898,10 +2989,11 @@ th {
   position: relative;
   top: -45px;
 }
-.updates_timeline > li .update_info >h3 {
+.updates_timeline > li .update_info > h3 {
   font-size: 1.1em;
   margin-left: -3%;
 }
+/* The icons  */
 .updates_timeline > li .update_icon {
   position: relative;
   border-radius: 50%;
@@ -2914,6 +3006,7 @@ th {
   color: #fff;
   line-height: 35px;
 }
+/* More Button */
 .updates_timeline #more_button .update_icon {
   position: relative;
   border-radius: 0;
@@ -3021,6 +3114,9 @@ th {
   vertical-align: super;
   font-size: 13px;
 }
+/******************************************* 
+************* Task Management ************** 
+********************************************/
 #taskManagementContainer .data-body {
   margin-bottom: 50px;
 }
@@ -3083,15 +3179,16 @@ th {
 #taskManagementContainer .other-details {
   color: #979797;
 }
+/*overwriting jquery ui css*/
 .ui-menu {
   z-index: 10000;
 }
 #taskManagementContainer button.active {
   background: #3B83F7;
   color: white;
-  text-shadow: 0 1px rgba(0,0,0,0.3);
+  text-shadow: 0 1px rgba(0, 0, 0, 0.3);
   border: 1px solid #135fd7;
-  box-shadow: inset 0 1px 2px rgba(0,0,0,0.3);
+  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.3);
 }
 .taskSubject {
   width: 99%;
@@ -3099,6 +3196,9 @@ th {
 #taskManagementContainer .mCustomScrollbar .mCSB_inside > .mCSB_container {
   margin-right: 13px;
 }
+/******************************************* 
+************* Settings Page ************** 
+********************************************/
 .settingsPageDiv.content-area {
   margin-right: 0;
 }
@@ -3132,6 +3232,9 @@ th {
 .settingsgroup-accordion a i {
   margin-right: 5px;
 }
+.settingsgroup-accordion a span {
+  text-transform: uppercase;
+}
 .settingsgroup {
   background: #2C3B49;
   height: 100%;
@@ -3288,35 +3391,59 @@ th {
 }
 .mini-slider-control[data-value="0"] .ui-slider-handle {
   background: #7d7e7d;
-  background: -moz-linear-gradient(top,#7d7e7d 0%,#0e0e0e 100%);
-  background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#7d7e7d),color-stop(100%,#0e0e0e));
-  background: -webkit-linear-gradient(top,#7d7e7d 0%,#0e0e0e 100%);
-  background: -o-linear-gradient(top,#7d7e7d 0%,#0e0e0e 100%);
-  background: -ms-linear-gradient(top,#7d7e7d 0%,#0e0e0e 100%);
-  background: linear-gradient(to bottom,#7d7e7d 0%,#0e0e0e 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#7d7e7d',endColorstr='#0e0e0e',GradientType=0);
+  /* Old browsers */
+  background: -moz-linear-gradient(top, #7d7e7d 0%, #0e0e0e 100%);
+  /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #7d7e7d), color-stop(100%, #0e0e0e));
+  /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #7d7e7d 0%, #0e0e0e 100%);
+  /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top, #7d7e7d 0%, #0e0e0e 100%);
+  /* Opera 11.10+ */
+  background: -ms-linear-gradient(top, #7d7e7d 0%, #0e0e0e 100%);
+  /* IE10+ */
+  background: linear-gradient(to bottom, #7d7e7d 0%, #0e0e0e 100%);
+  /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#7d7e7d', endColorstr='#0e0e0e', GradientType=0);
+  /* IE6-9 */
   margin-left: 0px;
 }
 .mini-slider-control[data-value="1"] .ui-slider-handle {
   background: #ffb76b;
-  background: -moz-linear-gradient(top,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#ffb76b),color-stop(0%,#ffa73d),color-stop(49%,#ff7c00),color-stop(100%,#ff7f04));
-  background: -webkit-linear-gradient(top,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  background: -o-linear-gradient(top,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  background: -ms-linear-gradient(top,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  background: linear-gradient(to bottom,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffb76b',endColorstr='#ff7f04',GradientType=0);
+  /* Old browsers */
+  background: -moz-linear-gradient(top, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffb76b), color-stop(0%, #ffa73d), color-stop(49%, #ff7c00), color-stop(100%, #ff7f04));
+  /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* Opera 11.10+ */
+  background: -ms-linear-gradient(top, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* IE10+ */
+  background: linear-gradient(to bottom, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffb76b', endColorstr='#ff7f04', GradientType=0);
+  /* IE6-9 */
   margin-left: -6px;
 }
 .mini-slider-control[data-value="2"] .ui-slider-handle {
   background: #bfd255;
-  background: -moz-linear-gradient(top,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#bfd255),color-stop(79%,#8eb92a),color-stop(100%,#72aa00),color-stop(100%,#9ecb2d));
-  background: -webkit-linear-gradient(top,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  background: -o-linear-gradient(top,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  background: -ms-linear-gradient(top,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  background: linear-gradient(to bottom,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bfd255',endColorstr='#9ecb2d',GradientType=0);
+  /* Old browsers */
+  background: -moz-linear-gradient(top, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #bfd255), color-stop(79%, #8eb92a), color-stop(100%, #72aa00), color-stop(100%, #9ecb2d));
+  /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* Opera 11.10+ */
+  background: -ms-linear-gradient(top, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* IE10+ */
+  background: linear-gradient(to bottom, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bfd255', endColorstr='#9ecb2d', GradientType=0);
+  /* IE6-9 */
   margin-left: -13px;
 }
 .ModulemanagerSettings .moduleblock .hiden {
@@ -3341,10 +3468,13 @@ th {
 th {
   padding: 6px;
 }
+/******************************************* 
+********** CustomerPortal styles start ********
+********************************************/
 .cp-tabs .enabledModules {
   display: inline-block ! important;
-  margin-left: 4px !important;
-  margin-right: 4px !important;
+  margin-left: 4px!important;
+  margin-right: 4px!important;
   vertical-align: top;
 }
 .drag-portal-module {
@@ -3451,7 +3581,7 @@ th {
   margin-left: 5px;
 }
 .portal-field-delete {
-  margin-left: 45px !important;
+  margin-left: 45px!important;
 }
 .portalModuleRow {
   border-left: 4px solid #3498DB !important;
@@ -3468,7 +3598,7 @@ th {
   content: "*";
   color: red;
 }
-.nav-tabs .cp-modules > .active >a,
+.nav-tabs .cp-modules > .active > a,
 .nav-tabs .cp-modules > .active > a:hover {
   border: 0px !important;
   border-top-right-radius: 0px;
@@ -3630,7 +3760,7 @@ th {
   display: inline-block;
 }
 .quickPreview .updates_timeline:before {
-  background: #e6e6e6;
+  background: #e5e5e5;
   width: 2px;
   margin-left: -1%;
 }
@@ -3645,13 +3775,16 @@ th {
 .quickPreviewComments .recentComments .commentDetails .comment {
   line-height: 15px;
 }
-.quickPreviewComments  .summaryWidgetContainer {
+.quickPreviewComments .summaryWidgetContainer {
   border: 0;
   padding: 0;
 }
 .quickPreview .recentActivitiesContainer .history {
   padding: 0;
 }
+/******************************************* 
+********** Calendar view styles ************
+********************************************/
 .calendar-sidebar {
   width: 100% !important;
 }
@@ -3808,6 +3941,11 @@ th {
   display: inline-block;
   text-align: center;
 }
+/******************************************* 
+********** Calendar view styles end ********
+
+********** Documents Module styles *********
+********************************************/
 .dragdrop-dotted {
   border: 2px dashed #C0C0C0;
   min-width: 300px;
@@ -3867,13 +4005,16 @@ tr.file > td.fileOwnerData {
   width: 100px;
   white-space: pre-wrap;
 }
+/******************************************* 
+********** Documents Module styles end *****
+********************************************/
 .engagementsContainer .engagements_content {
   padding-top: 15px;
 }
 .summaryWidgetContainer .engagementsContainer table {
   width: inherit;
 }
-.engagements_content table thead>tr:first-child {
+.engagements_content table thead > tr:first-child {
   border: 1px solid #CCC;
   background-color: #F5F5F5;
 }
@@ -3924,6 +4065,9 @@ tr.file > td.fileOwnerData {
   font-size: 15px;
   padding: 1% 0;
 }
+/******************************************* 
+********** Mailroom view styles start ********
+********************************************/
 .mailroomBanner {
   margin: 23px 0;
   height: 215px;
@@ -4132,6 +4276,7 @@ tr.file > td.fileOwnerData {
   margin-left: 0;
 }
 .mentionMessages .mention_follow_up {
+  /*//load this color from variable.less*/
   background-color: green;
 }
 .modelContainer .modal-content {
@@ -4280,6 +4425,7 @@ form[name="notification_settings"] .select2-choice {
   margin-left: 0;
 }
 .mentionMessages .mention_follow_up {
+  /*//load this color from variable.less*/
   background-color: green;
 }
 .modal-content .mention_followup .row {
@@ -4311,6 +4457,9 @@ form[name="notification_settings"] .select2-choice {
 .mentionMessageHeader .MultiFile-remove {
   color: #FFFFFF;
 }
+/******************************************* 
+********** Mailroom view styles end ********
+********************************************/
 .detailview-header {
   margin-bottom: 10px;
 }
@@ -4326,6 +4475,7 @@ form[name="notification_settings"] .select2-choice {
   margin: 0px 10px;
   text-decoration: underline !important;
   color: #3498DB;
+  /*font-size : 12px;*/
 }
 .tag {
   display: inline-block;
@@ -4409,11 +4559,10 @@ form[name="notification_settings"] .select2-choice {
   border: 1px solid #dcdcdc;
 }
 #tagCloud .tag {
-  color: #5ea9dd;
-  padding: 0px;
   background-color: #FFFFFF;
   border-color: #FFFFFF;
   border-radius: 0px;
+  color: #5ea9dd;
   margin: 3px;
 }
 #tagCloud .tag[data-type="public"] {
@@ -4424,6 +4573,9 @@ form[name="notification_settings"] .select2-choice {
   max-width: 80px;
   vertical-align: bottom;
 }
+/******************************************* 
+********** Groups view styles ********
+********************************************/
 #s2id_memberList li > div,
 .groupMembersColors li > div {
   margin-left: 10px;
@@ -4498,6 +4650,12 @@ form[name="notification_settings"] .select2-choice {
   margin: 0px;
   color: #444444;
 }
+/******************************************* 
+********** Groups view styles  ends********
+********************************************/
+/******************************************* 
+********** Picklist Css ********
+********************************************/
 .pickListValue {
   background-color: #FFFFFF;
 }
@@ -4512,6 +4670,12 @@ form[name="notification_settings"] .select2-choice {
   padding: 2px 1px !important;
   line-height: 15px;
 }
+/******************************************* 
+************* Dashboard Styles *************
+********************************************/
+li.dashboardWidget {
+  overflow: auto;
+}
 .dashboardWidgetHeader .title {
   padding-bottom: 10px;
   font-size: 15px;
@@ -4532,9 +4696,6 @@ form[name="notification_settings"] .select2-choice {
 .dashBoardContainer .tabContainer .tab-content {
   margin-top: 10px;
 }
-.dashBoardContainer .dashBoardTabContents ul {
-  margin: 0;
-}
 .dashBoardContainer .dashBoardTabContents ul li {
   border: 3px solid #E2E2E4;
   box-shadow: 1px;
@@ -4601,7 +4762,7 @@ form[name="notification_settings"] .select2-choice {
   display: inline-block;
   opacity: 1;
 }
-.dashBoardContainer .tabContainer li a  .deleteTab:hover {
+.dashBoardContainer .tabContainer li a .deleteTab:hover {
   cursor: pointer;
 }
 #minilistWizardContainer .fieldLabel {
@@ -4638,6 +4799,9 @@ form[name="notification_settings"] .select2-choice {
   resize: none;
   width: 100%;
 }
+/******************************************* 
+********** Picklist DependencyGraph ********
+********************************************/
 #dependencyGraph .tableHeading {
   text-align: center;
   padding-top: 30px;
@@ -4663,12 +4827,15 @@ form[name="notification_settings"] .select2-choice {
 #dependencyGraph .dependencyMapping .pickListDependencyTable .selectedCell {
   background: #a9cbf5;
 }
+/******************************************* 
+********** Rewriting select2 for consistency********
+********************************************/
 .select2-container .select2-choice {
   height: 29px;
   border-radius: 1px;
 }
 .modal {
-  z-index: 1100;
+  z-index: 1070;
 }
 .select2-container .select2-choice {
   height: 28px;
@@ -4756,6 +4923,7 @@ hr {
   position: fixed;
   bottom: 0;
   background: #EFEFEF;
+  /*width:100%;*/
   border-left: 42px solid #2c3b49;
   height: 60px;
   left: 0;
@@ -4774,7 +4942,6 @@ hr {
 }
 .settingsPageDiv .modal-overlay-footer {
   margin-left: 230px;
-  border-left: 0px solid;
 }
 .settingsOverlayContainer .modal-overlay-footer {
   margin: 0;
@@ -4797,14 +4964,14 @@ hr {
   vertical-align: middle;
   margin-top: 6px;
 }
-.list-menu-content .pull-right>.dropdown-menu {
+.list-menu-content .pull-right > .dropdown-menu {
   left: -126px;
   position: relative;
 }
-.dropdown-menu>li>a {
+.dropdown-menu > li > a {
   padding: 4px 6px;
 }
-.dropdown-menu>li>a span i {
+.dropdown-menu > li > a span i {
   font-size: 15px;
   vertical-align: middle;
 }
@@ -4812,11 +4979,11 @@ hr {
   max-height: 300px;
   padding-left: 0;
 }
-.related-tabs .dropdown-menu>.mCustomScrollBox>.mCSB_container {
+.related-tabs .dropdown-menu > .mCustomScrollBox > .mCSB_container {
   margin-right: 0;
   padding: 4px 6px;
 }
-.related-tabs .dropdown-menu>.mCustomScrollBox>.mCSB_container>li>a {
+.related-tabs .dropdown-menu > .mCustomScrollBox > .mCSB_container > li > a {
   display: block;
   padding: 3px 5px;
   clear: both;
@@ -4825,7 +4992,7 @@ hr {
   color: #333;
   white-space: nowrap;
 }
-.related-tabs .dropdown-menu>.mCustomScrollBox>.mCSB_container span i {
+.related-tabs .dropdown-menu > .mCustomScrollBox > .mCSB_container span i {
   font-size: 15px;
   vertical-align: middle;
 }
@@ -4848,16 +5015,16 @@ hr {
 .calendar-sidebar .calendar-sidebar-tabs.padding {
   padding-left: 20px !important;
 }
-.related-tabs.row .nav>li {
+.related-tabs.row .nav > li {
   padding: 0 10px;
   margin: 0 2px;
 }
-.massEditTabs.nav>li {
+.massEditTabs.nav > li {
   padding: 0 10px;
   margin: 0 4px;
 }
-.row .nav>li>a,
-.row .nav>li>a:hover {
+.row .nav > li > a,
+.row .nav > li > a:hover {
   padding: 10px 3px;
   border: none;
   vertical-align: bottom;
@@ -4867,38 +5034,39 @@ hr {
   -webkit-box-sizing: border-box;
   -o-box-sizing: border-box;
 }
-.row .nav>li>a:hover {
+.row .nav > li > a:hover {
   border-bottom-color: #555;
 }
-TN-34230
-
-.row .nav>li>a:hover {
+/*.row ul{
+    padding:0;
+}*/
+TN-34230 .row .nav > li > a:hover {
   border-bottom-color: #555;
   background: none;
 }
 .row ul li:first-child {
   margin-left: 0;
 }
-.related-tabs .nav-tabs>li.active,
-.related-tabs .nav-tabs>li:hover,
-.related-tabs .nav-tabs>li.active:focus,
-.dashBoardContainer .nav-tabs>li.active,
-.dashBoardContainer .nav-tabs>li:hover,
-.dashBoardContainer .nav-tabs>li.active:focus,
-.contents.tabbable .nav-tabs>li.active,
-.contents.tabbable .nav-tabs>li:hover,
-.contents.tabbable .nav-tabs>li.active:focus {
+.related-tabs .nav-tabs > li.active,
+.dashBoardContainer .nav-tabs > li.active,
+.contents.tabbable .nav-tabs > li.active,
+.related-tabs .nav-tabs > li:hover,
+.dashBoardContainer .nav-tabs > li:hover,
+.contents.tabbable .nav-tabs > li:hover,
+.related-tabs .nav-tabs > li.active:focus,
+.dashBoardContainer .nav-tabs > li.active:focus,
+.contents.tabbable .nav-tabs > li.active:focus {
   border: none;
   border-bottom: 3px solid #555;
 }
-.nav-tabs>li.active>a,
-.nav-tabs>li.active>a:hover,
-.nav-tabs>li.active>a:focus,
-.nav-tabs>li>a {
+.nav-tabs > li.active > a,
+.nav-tabs > li.active > a:hover,
+.nav-tabs > li.active > a:focus,
+.nav-tabs > li > a {
   border: 0;
 }
-.nav>li>a:hover,
-.nav>li>a:focus {
+.nav > li > a:hover,
+.nav > li > a:focus {
   background-color: #FFFFFF;
 }
 .fa-pencil,
@@ -4908,6 +5076,9 @@ TN-34230
 .commentAttachmentName {
   font-size: 11px;
 }
+/******************************************* 
+********** Layout Editor ********
+********************************************/
 .marginBottom10px {
   margin-bottom: 10px;
 }
@@ -4930,6 +5101,7 @@ TN-34230
 }
 .zeroOpacity {
   opacity: 0;
+  /*for IE*/
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
   filter: alpha(opacity=0);
 }
@@ -4956,10 +5128,12 @@ TN-34230
 .layoutContent .opacity:hover .actions {
   opacity: 1;
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
+  /*for IE*/
   filter: alpha(opacity=100);
 }
 .layoutContent .fieldPropertyContainer:hover .actions {
   opacity: 1;
+  /*for IE*/
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
   filter: alpha(opacity=100);
 }
@@ -4982,6 +5156,7 @@ TN-34230
 .relatedTabModulesList .addButton {
   border-radius: 2px;
   border: 1px solid #DDDDDD;
+  text-transform: uppercase;
   color: #666666;
   background: #FFFFFF;
 }
@@ -5055,6 +5230,9 @@ TN-34230
   margin-left: 5px;
   word-break: break-all;
 }
+/******************************************* 
+************** Tax Management **************
+********************************************/
 #TaxCalculationsContainer .table tr:first-child,
 .taxModalContainer #editTax .table tr:first-child {
   border-bottom: 1px solid #ccc;
@@ -5094,6 +5272,9 @@ TN-34230
   max-height: 500px;
   overflow-y: auto;
 }
+/******************************************* 
+********** Workflows ********
+********************************************/
 #workflow_edit .editViewBody {
   overflow: inherit;
 }
@@ -5103,7 +5284,7 @@ TN-34230
 }
 .timePicker {
   width: 9.5em !important;
-  z-index: 1101 !important;
+  z-index: 1070 !important;
 }
 .weekDaySelect .ui-state-default {
   background: inherit;
@@ -5141,75 +5322,6 @@ TN-34230
 .module-filters.active {
   background: #F7F7F7;
 }
-.payment-type-selection {
-  margin-bottom: 30px;
-}
-.payment-type-selection img {
-  vertical-align: middle;
-}
-.currplan {
-  padding: 10px 20px;
-  background-color: #f3f3f3;
-  border: 1px solid #eee;
-  border-radius: 3px;
-}
-.currplan div {
-  display: inline-block;
-  font-size: 16px;
-}
-.planName {
-  display: inline-block;
-  color: #fff;
-  padding: 20px;
-  margin: 10px 20px;
-  font-size: 24px;
-  border-radius: 2px;
-}
-.plan-heading {
-  min-height: 168px;
-}
-.plan-title {
-  color: #fff;
-  font-size: 20px;
-  padding: 13px 0;
-}
-#sales_plan {
-  background: #3FC380;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#salespremium_plan {
-  background: #00B16A;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#support_plan {
-  background: #2980B9;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#supportpremium_plan {
-  background: #2980B9;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#ultimate_plan,
-#exclusive_plan {
-  background: #F39C12;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#contact_plan {
-  background: #FF5959;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
 .workflowListContainer .select2-container .select2-choice {
   height: 36px;
 }
@@ -5224,6 +5336,7 @@ TN-34230
 .contactAdd {
   border: 1px solid #eee;
   padding: 20px;
+  /*min-height: 310px !important;*/
 }
 #subDetails table td {
   padding: 7px 10px;
@@ -5346,9 +5459,9 @@ TN-34230
 .productBundles {
   padding-left: 20px;
 }
-.nav .open>a,
-.nav .open>a:hover,
-.nav .open>a:focus {
+.nav .open > a,
+.nav .open > a:hover,
+.nav .open > a:focus {
   color: #000000;
   background-color: #FFFFFF;
 }
@@ -5369,6 +5482,9 @@ TN-34230
   width: 100%;
   overflow-x: auto;
 }
+/******************************************* 
+*************** Mail Manager ***************
+********************************************/
 #mm_searchButton {
   height: 28px;
   background-color: #FFFFFF;
@@ -5424,8 +5540,8 @@ TN-34230
   padding: 1px 5px;
   border-radius: 3px;
   text-align: center;
-  text-shadow: 0 1px rgba(0,0,0,0.1);
-  background-image: -webkit-linear-gradient(top,#DD4B39 0,#D14836 100%);
+  text-shadow: 0 1px rgba(0, 0, 0, 0.1);
+  background-image: -webkit-linear-gradient(top, #DD4B39 0, #D14836 100%);
   border: 1px solid #C6322A;
   background-color: #DD4B39;
 }
@@ -5643,6 +5759,7 @@ TN-34230
 .width40per {
   width: 40%;
 }
+/****** Mail Manager Ends ******/
 .quickCreateContent .massEditTable textarea,
 .addCommentBlock .commentTextArea textarea {
   resize: vertical;
@@ -5655,19 +5772,20 @@ TN-34230
 .select2-container-multi .select2-choices {
   z-index: 1;
 }
-.nav .nav-stacks .cp-nav-header-wrapper>li.disabled>a:hover {
+/****** Customer Portal Settings ******/
+.nav .nav-stacks .cp-nav-header-wrapper > li.disabled > a:hover {
   background-color: #fff;
 }
-.cp-nav-header-wrapper>li.disabled>a:hover {
+.cp-nav-header-wrapper > li.disabled > a:hover {
   border: 0px ! important;
 }
-.nav .nav-stacks .cp-nav-header-wrapper>li.disabled>a {
+.nav .nav-stacks .cp-nav-header-wrapper > li.disabled > a {
   background-color: #fff;
 }
-#portalModulesTable>li.portalModuleRow.active>a:hover {
+#portalModulesTable > li.portalModuleRow.active > a:hover {
   background-color: #fff !important;
 }
-#portalModulesTable>li.portalModuleRow.active>a:focus {
+#portalModulesTable > li.portalModuleRow.active > a:focus {
   background-color: #fff !important;
 }
 .portal-dashboard {
@@ -5766,7 +5884,7 @@ TN-34230
 .portal-dashboard {
   border-bottom: 0px ! important;
 }
-#portal-shortcutsContainer>ul {
+#portal-shortcutsContainer > ul {
   border-bottom: 0px ! important;
 }
 .portalMenuHeader {
@@ -5775,14 +5893,15 @@ TN-34230
 }
 .cp-tabs .enabledModules {
   display: inline-block ! important;
-  margin-left: 4px !important;
-  margin-right: 4px !important;
+  margin-left: 4px!important;
+  margin-right: 4px!important;
   vertical-align: top;
   margin-top: 4px !important;
 }
 .portal-shortcut-list:hover {
   border-bottom: 3px solid transparent ! important;
 }
+/****** Customer Portal Settings ******/
 .label-radio label input[type="radio"] {
   position: relative;
   top: 2px;
@@ -5794,6 +5913,9 @@ TN-34230
 div.tooltip-inner {
   max-width: 400px;
 }
+/******************************************* 
+********** Menu Editor ********
+********************************************/
 .sortable.appContainer.ui-sortable {
   width: 160px;
 }
@@ -5968,7 +6090,7 @@ div.tooltip-inner {
   width: 13px !important;
   margin-top: 8px;
 }
-.detailview-table .input-group-addon+.inputElement.form-control,
+.detailview-table .input-group-addon + .inputElement.form-control,
 .detailview-table .inputElement.form-control.input-medium {
   width: 100%;
 }
@@ -6015,6 +6137,7 @@ div.tooltip-inner {
   float: left;
   margin-right: 5px;
 }
+/***** Oursites Changes *****/
 .portal-table .table-actions {
   width: inherit ! important;
 }
@@ -6026,6 +6149,7 @@ div.tooltip-inner {
   padding: 10px 5px ! important;
   padding-left: 10px ! important;
 }
+/***** Oursites Changes *****/
 .ExtensionscontentsDiv .content-area {
   padding-left: 15px;
   padding-right: 15px;
@@ -6039,14 +6163,14 @@ div.tooltip-inner {
 }
 .blockHeader {
   border-color: #F3F3F4 #F3F3F4 #cbcbcf;
-  border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
   background-color: #474747;
-  background-image: -moz-linear-gradient(top,#555555,#333333);
-  background-image: -ms-linear-gradient(top,#555555,#333333);
-  background-image: -webkit-gradient(linear,0 0,0 100%,from(#555555),to(#333333));
-  background-image: -webkit-linear-gradient(top,#555555,#333333);
-  background-image: -o-linear-gradient(top,#555555,#333333);
-  background-image: linear-gradient(top,#555555,#333333);
+  background-image: -moz-linear-gradient(top, #555555, #333333);
+  background-image: -ms-linear-gradient(top, #555555, #333333);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#333333));
+  background-image: -webkit-linear-gradient(top, #555555, #333333);
+  background-image: -o-linear-gradient(top, #555555, #333333);
+  background-image: linear-gradient(top, #555555, #333333);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#333333', GradientType=0);
   min-height: 30px;
@@ -6139,8 +6263,8 @@ div.tooltip-inner {
 .markStar .starredStatus {
   display: none;
 }
-.nav>li.addDashboardTab>a,
-.nav>li.addDashboardTab>a:hover {
+.nav > li.addDashboardTab > a,
+.nav > li.addDashboardTab > a:hover {
   padding: 10px 15px;
   background: inherit;
 }
@@ -6153,7 +6277,7 @@ div.tooltip-inner {
   height: 960px;
   width: 1260px;
 }
-.nav-tabs>li {
+.nav-tabs > li {
   border-bottom: 3px solid transparent;
   margin: 0 2px;
 }
@@ -6231,16 +6355,14 @@ div.tooltip-inner {
 }
 .select2-container.select2-container-multi.select2,
 .editViewPageDiv .select2-container.select2-container-multi.select2 {
-  height: auto !important;
+  height: auto!important;
 }
-.summaryViewFields .select2-container-multi.inputElement.form-control
-.quickCreateContent .select2-container.select2-container-multi.select2,
+.summaryViewFields .select2-container-multi.inputElement.form-control .quickCreateContent .select2-container.select2-container-multi.select2,
 #massEditContainer .select2-container.select2-container-multi.select2 {
   width: 150px;
   height: auto !important;
 }
-.summaryViewFields .select2-container-multi.inputElement.form-control
-.quickCreateContent .select2-container.select2-container-multi.select2 .input-save-wrap,
+.summaryViewFields .select2-container-multi.inputElement.form-control .quickCreateContent .select2-container.select2-container-multi.select2 .input-save-wrap,
 #massEditContainer .select2-container.select2-container-multi.select2 .input-save-wrap {
   float: right;
   margin-right: 25px;
@@ -6336,6 +6458,7 @@ a.cp-modules:hover {
 #RestrictionsLayout {
   background: #fafafb;
   margin-top: -92px;
+  /*to adjust with page padding top*/
 }
 #RestrictionsLayout .vtImage {
   width: 22%;
@@ -6369,6 +6492,7 @@ a.cp-modules:hover {
 .datepicker {
   z-index: 1100 !important;
 }
+/*****RSS Changes****/
 .feedListContainer .listview-table tr td:first-child,
 .listview-table tr th:first-child {
   width: inherit ! important;
@@ -6376,12 +6500,14 @@ a.cp-modules:hover {
 .feedListContainer .listViewEntries .listViewEntryValue {
   max-width: inherit ! important;
 }
-.ps-container>.ps-scrollbar-y-rail {
+/*****RSS Changes****/
+.ps-container > .ps-scrollbar-y-rail {
   z-index: 1002;
 }
 #relationBlock .recordScroll {
   max-height: 150px;
 }
+/*Start - List sidebar toggle*/
 .essentials-toggle {
   background-color: white;
   font-weight: bold;
@@ -6401,6 +6527,7 @@ a.cp-modules:hover {
 .essentials-toggle .fa-chevron-right {
   background-position: -460px -72px !important;
 }
+/*End - List essentials toggle*/
 .module-name-tooltip .qtip-content {
   font-size: 12px;
   padding: 3px;
@@ -6484,8 +6611,8 @@ li.select2-search-choice div {
 .popover ul.listmenu li {
   padding: 3px;
 }
-.popover-content .disabled>a,
-.popover .disabled>a {
+.popover-content .disabled > a,
+.popover .disabled > a {
   opacity: 0.5;
   cursor: not-allowed;
 }
@@ -6496,6 +6623,7 @@ li.select2-search-choice div {
   -o-transform: rotate(180deg);
   transform: rotate(180deg);
 }
+/*Start - List sidebar toggle*/
 .essentials-toggle {
   background-color: white;
   font-weight: bold;
@@ -6515,6 +6643,7 @@ li.select2-search-choice div {
 .essentials-toggle .fa-chevron-right {
   background-position: -460px -72px !important;
 }
+/*End - List essentials toggle*/
 .module-name-tooltip .qtip-content {
   font-size: 12px;
   padding: 3px;
@@ -6595,16 +6724,16 @@ li.select2-search-choice div {
 #reportDetails .pivot .toptitle.targetY0,
 #reportDetails .pivot .lefttitle.targetX0 {
   border-color: #F3F3F4 #F3F3F4 #cbcbcf;
-  border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
   background-color: #474747;
-  background-image: -moz-linear-gradient(top,#555555,#333333);
-  background-image: -ms-linear-gradient(top,#555555,#333333);
-  background-image: -webkit-gradient(linear,0 0,0 100%,from(#555555),to(#333333));
-  background-image: -webkit-linear-gradient(top,#555555,#333333);
-  background-image: -o-linear-gradient(top,#555555,#333333);
-  background-image: linear-gradient(top,#555555,#333333);
+  background-image: -moz-linear-gradient(top, #555555, #333333);
+  background-image: -ms-linear-gradient(top, #555555, #333333);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#333333));
+  background-image: -webkit-linear-gradient(top, #555555, #333333);
+  background-image: -o-linear-gradient(top, #555555, #333333);
+  background-image: linear-gradient(top, #555555, #333333);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555',endColorstr='#333333',GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#333333', GradientType=0);
   min-height: 30px;
 }
 #reportDetails .pivot th.toptitle.targetY0,
@@ -6646,7 +6775,8 @@ li.select2-search-choice div {
   background: #FFFFFF;
 }
 .templateActions {
-  background: rgba(0,0,0,0.1);
+  background: rgba(0, 0, 0, 0.1);
+  /*padding: 4%;*/
   bottom: 0;
   text-align: center;
   position: absolute;
@@ -6654,6 +6784,9 @@ li.select2-search-choice div {
   zoom: 1;
   width: 100%;
 }
+/*.templateActions i {
+    margin-right: 30px;
+}*/
 .thumbnails > li {
   float: left;
   height: 315px !important;
@@ -6828,9 +6961,10 @@ a.btnReport:hover {
   left: 0px;
 }
 .bx-wrapper .bx-viewport {
-  width:99%;
+  width: 99%;
   left: 0px;
   background: #fff;
+  /*fix other elements on the page moving (on Chrome)*/
   -webkit-transform: translatez(0);
   -moz-transform: translatez(0);
   -ms-transform: translatez(0);
@@ -6888,7 +7022,7 @@ a.btnReport:hover {
 .filter-search-show {
   display: block !important;
 }
-.emailTemplatesPopupTableContainer .listViewEntries  .listViewEntryValue {
+.emailTemplatesPopupTableContainer .listViewEntries .listViewEntryValue {
   max-width: 100%;
   min-width: 150px;
 }
@@ -6923,12 +7057,15 @@ input:focus::-webkit-input-placeholder {
 input:focus:-moz-placeholder {
   color: transparent;
 }
+/* FF 4-18 */
 input:focus::-moz-placeholder {
   color: transparent;
 }
+/* FF 19+ */
 input:focus:-ms-input-placeholder {
   color: transparent;
 }
+/* IE 10+ */
 .global-actions .dropdown-menu:before {
   position: absolute;
   top: -7px;
@@ -6937,7 +7074,7 @@ input:focus:-ms-input-placeholder {
   border-right: 7px solid transparent;
   border-bottom: 7px solid #ccc;
   border-left: 7px solid transparent;
-  border-bottom-color: rgba(0,0,0,0.2);
+  border-bottom-color: rgba(0, 0, 0, 0.2);
   content: '';
 }
 .global-actions .dropdown-menu:after {
@@ -7122,6 +7259,7 @@ input:focus:-ms-input-placeholder {
   text-align: center;
 }
 #OnBoardLayout #OnBoardPageContainer .crmGoals textarea::-webkit-input-placeholder {
+  /* WebKit browsers */
   text-align: center;
   padding: 20%;
   font-size: 12px;
@@ -7263,121 +7401,3 @@ input:focus:-ms-input-placeholder {
 .importServiceSelectionContainer .app-item {
   text-align: center;
 }
-.fieldValue .value a {
-  color: #15c !important;
-}
-.editViewContents .fieldLabel {
-  min-width: 100px;
-  width: 20%;
-  word-break: break-all;
-}
-.editViewContents .fieldValue {
-  width:30%;
-}
-.editViewContents td.fieldValue[colspan="3"] {
-  width:80%;
-}
-.editViewContents textarea.textAreaElement {
-  width: 88%;
-}
-.editViewContents input[type="checkbox"] {
-  width: 15px;
-  height: 15px;
-}
-.editViewContents input[type="radio"] {
-  width: 15px;
-  height: 15px;
-}
-#composeEmailContainer .modal-body .quickCreateContent,
-#QuickCreate .modal-body .quickCreateContent,
-#create .quickCreateContent {
-  margin-top: 25px;
-}
-.settingsgroup-panel .widgetContainer .menuItemLabel .pinUnpinShortCut {
-  display: none;
-  margin-top: 2px;
-}
-.settingsgroup-panel .widgetContainer .menuItemLabel:hover .pinUnpinShortCut {
-  display: inline-block;
-}
-@-moz-document url-prefix() {
-  .duplicateHandlingContainer .tooltip-inner {
-    width: 550px;
-    max-width: 550px;
-  }
-}
-.duplicateHandlingContainer .tooltip-inner {
-  text-align: left !important;
-}
-.duplicateHandlingContainer .syncMessage {
-  margin-top: 5px !important;
-}
-.duplicateHandlingContainer .actionsList {
-  width: 230px !important;
-}
-.duplicationMessageContainer {
-  background-color: #f2dede !important;
-  color: #b94a48 !important;
-}
-.duplicationMessageContainer .duplicationMessageHeader {
-  margin-bottom: 8px;
-}
-.listViewRecordActions .quickView, .listViewRecordActions .markStar,
-.listViewRecordActions .markAsHeld,.listViewRecordActions .holdFollowupOn {
-  margin-top: 4px;
-}
-.app-menu .module-icon .custom-module {
-	font-size: 14px;
-	border-radius: 4px;
-	color: #000;
-	background-color: #fff;
-	padding: 4px 10px 4px 5px !important
-}
-.menu-item .custom-module {
-	font-family: 'OpenSans-Regular', sans-serif;
-	font-size: 12px;
-	border-radius: 4px;
-	padding: 2px;
-	color: #000;
-	background-color: #fff;
-}
-.modules-menu .custom-module {
-	color: #fff;
-	margin-left: 0px;
-	display: inline;
-	border: 1px solid #fff;
-	border-radius: 4px;
-	padding: 3px 4px 3px 2px !important;
-	font-weight: bold;
-}
-#quickCreateModules .custom-module, .workflowListContainer .custom-module, .dashBoardTabContents .custom-module {
-	border-radius: 4px;
-	padding: 3px 5px;
-	color: #fff;
-	background-color: #777;
-}
-.menuEditorItem .custom-module {
-	border-radius: 4px;
-	padding: 3px 5px;
-	color: #000;
-	background-color: #fff;
-}
-.task-details .custom-module {
-	border-radius: 4px;
-	padding: 1px 4px;
-	color: white;
-	background-color: #777;
-}
-.related-tabs .custom-module, #relatedmenuList .custom-module {
-	border-radius: 4px;
-	color: #fff;
-	background-color: #777;
-	padding: 5px 7px;
-	font-weight: bold;
-}
-.record-header .custom-module {
-	font-size: 30px;
-}
-.moduleIcon .custom-module {
-	font-weight: bold;
-}
\ No newline at end of file
diff --git a/layouts/v7/skins/inventory/style.css b/layouts/v7/skins/inventory/style.css
index 2f7e4b048d9e28ba9ef5436b50e4c93fb5dd3e35..f93f654941703ab3344f9860c850b9d53c40b99b 100644
--- a/layouts/v7/skins/inventory/style.css
+++ b/layouts/v7/skins/inventory/style.css
@@ -1,7 +1,9 @@
 @font-face {
   font-family: 'Oswald';
   src: url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.eot');
-  src: url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.eot?#iefix') format('embedded-opentype'), url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.woff') format('woff'), url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.ttf') format('truetype'), url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.svg#Oswald') format('svg');
+  /* IE9 Compat Modes */
+  src: url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.svg#Oswald') format('svg');
+  /* Legacy iOS */
   font-weight: normal;
   font-style: normal;
   text-rendering: optimizeLegibility;
@@ -15,27 +17,37 @@ a:active {
 @font-face {
   font-family: 'OpenSans-Regular';
   src: url('../fonts/OpenSans/Regular/OpenSans-Regular.eot');
-  src: url('../fonts/OpenSans/Regular/OpenSans-Regular.ttf') format('truetype'), url('../fonts/OpenSans/Regular/OpenSans-Regular.eot?#iefix') format('embedded-opentype'), url('../fonts/OpenSans/Regular/OpenSans-Regular.woff2') format('woff2'), url('../fonts/OpenSans/Regular/OpenSans-Regular.woff') format('woff'), url('../fonts/OpenSans/Regular/OpenSans-Regular.svg#svgFontName') format('svg');
+  /* IE9 Compat Modes */
+  src: url('../fonts/OpenSans/Regular/OpenSans-Regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/OpenSans/Regular/OpenSans-Regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/OpenSans/Regular/OpenSans-Regular.woff2') format('woff2'), /* Super Modern Browsers */ url('../fonts/OpenSans/Regular/OpenSans-Regular.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/OpenSans/Regular/OpenSans-Regular.svg#svgFontName') format('svg');
+  /* Legacy iOS */
 }
 @font-face {
   font-family: 'OpenSans-Semibold';
   src: url('../fonts/OpenSans/Semibold/OpenSans-Semibold.eot');
-  src: url('../fonts/OpenSans/Semibold/OpenSans-Semibold.ttf') format('truetype'), url('../fonts/OpenSans/Semibold/OpenSans-Semibold.eot?#iefix') format('embedded-opentype'), url('../fonts/OpenSans/Semibold/OpenSans-Semibold.woff2') format('woff2'), url('../fonts/OpenSans/Semibold/OpenSans-Semibold.woff') format('woff'), url('../fonts/OpenSans/Semibold/OpenSans-Semibold.svg#svgFontName') format('svg');
+  /* IE9 Compat Modes */
+  src: url('../fonts/OpenSans/Semibold/OpenSans-Semibold.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/OpenSans/Semibold/OpenSans-Semibold.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/OpenSans/Semibold/OpenSans-Semibold.woff2') format('woff2'), /* Super Modern Browsers */ url('../fonts/OpenSans/Semibold/OpenSans-Semibold.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/OpenSans/Semibold/OpenSans-Semibold.svg#svgFontName') format('svg');
+  /* Legacy iOS */
 }
 @font-face {
   font-family: 'ProximaNova-Regular';
-  src: url('../fonts/ProximanovaWebfont/ProximaNova-Regular.ttf') format('truetype'), url('../fonts/ProximanovaWebfont/ProximaNova-Regular.woff') format('woff'), url('../fonts/ProximanovaWebfont/ProximaNova-Regular.eot?#iefix') format('embedded-opentype');
+  src: url('../fonts/ProximanovaWebfont/ProximaNova-Regular.ttf') format('truetype'), url('../fonts/ProximanovaWebfont/ProximaNova-Regular.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/ProximanovaWebfont/ProximaNova-Regular.eot?#iefix') format('embedded-opentype');
+  /* IE6-IE8 */
+  /* Safari, Android, iOS */
   font-style: normal;
   font-weight: normal;
   text-rendering: optimizeLegibility;
 }
 @font-face {
   font-family: 'ProximaNova-Semibold';
-  src: url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.ttf') format('truetype'), url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.woff') format('woff'), url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.eot?#iefix') format('embedded-opentype');
+  src: url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.eot?#iefix') format('embedded-opentype');
+  /* IE6-IE8 */
   font-style: normal;
   font-weight: normal;
   text-rendering: optimizeLegibility;
 }
+/**********************************/
+/************ Layout **************/
+/**********************************/
 html {
   height: 100%;
   overflow-y: auto;
@@ -102,6 +114,7 @@ body {
 @media (min-width: 992px) {
   .global-nav .logo-container {
     display: inline-block;
+    width: 150px;
     z-index: 2;
     padding-left: 6%;
     margin-top: 1px;
@@ -113,11 +126,13 @@ body {
     position: absolute;
     width: 100%;
     height: 42px;
+    /*        border-top:1px solid #ddd;*/
     border-bottom: 1px solid #ddd;
   }
   .app-nav .module-action-bar .module-action-content {
     background: #FBFBFB;
     height: 41px;
+    /*        border-bottom: 1px solid #eee;*/
   }
   .app-nav .module-action-bar .module-action-content .navbar-right {
     margin-right: 0;
@@ -163,7 +178,7 @@ body {
     padding-left: 0;
   }
 }
-.btn-toolbar >.btn-group:first-child {
+.btn-toolbar > .btn-group:first-child {
   margin-left: 5px;
 }
 .vt-notification {
@@ -196,15 +211,19 @@ body {
 .vt-notification [data-notify="message"] {
   color: #eaeaea;
 }
+/**********************************/
+/******** Navigation styles *******/
+/**********************************/
 .company-logo {
   height: 40px;
+  width: 150px;
   margin: 0 0;
   display: inline-block;
   margin-left: 1px;
 }
 .company-logo img {
-  max-height: 100%;
-  max-width: 100%;
+  height: 100%;
+  width: auto;
 }
 .navbar .fa {
   font-size: 15px;
@@ -214,10 +233,13 @@ body {
   font-size: 16px;
   position: relative;
 }
+/*.module-action-bar .module-action-content #appnav{
+    padding-top:5px;
+}*/
 .global-nav .navbar-nav > li div a {
   padding: 15px;
 }
-.global-nav>ul {
+.global-nav > ul {
   margin-right: 20px;
 }
 .global-nav .search-links-container {
@@ -267,26 +289,28 @@ body {
     float: right;
     height: 42px;
   }
-  .module-action-bar .navbar-right .nav>li {
+  .module-action-bar .navbar-right .nav > li {
     display: inline-block;
   }
-  .module-action-bar .navbar-right .nav>li a {
+  .module-action-bar .navbar-right .nav > li a {
     padding: 0 10px;
   }
   .global-nav .logo-container {
     border-bottom: 0;
+    width: 150px;
   }
 }
 @media (max-width: 991px) {
   .global-nav .logo-container {
     border-bottom: 0;
+    width: 150px;
   }
   .notificationMessageHolder {
     padding-left: 45%;
   }
 }
 @media (min-width: 991px) {
-  .nav>li>a.qc-button {
+  .nav > li > a.qc-button {
     padding: 2px 3px;
     margin-top: 13px;
     margin-right: 15px;
@@ -294,7 +318,7 @@ body {
     color: #fff;
     border-radius: 20px;
   }
-  .nav>li>a.qc-button span {
+  .nav > li > a.qc-button span {
     vertical-align: top;
   }
 }
@@ -313,6 +337,7 @@ body {
   width: 100%;
   height: 100%;
 }
+/** App Nav Styles */
 .active-app-title {
   white-space: nowrap;
   font-family: Oswald, "OpenSans-Semibold", "Helvetica Neue", Helvetica, sans-serif;
@@ -367,7 +392,9 @@ body {
   height: 42px;
   text-align: center;
   line-height: 42px;
+  /*    background-color: #2c3b49;*/
   color: #ffffff;
+  /*border-bottom: 1px solid #272B46;*/
 }
 .app-nav .app-indicator-icon-container .app-indicator-icon {
   font-size: 24px;
@@ -479,16 +506,16 @@ body {
   right: -4px;
 }
 #overlayPageContent .mCSB_scrollTools,
-#overlayPageContent .mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar,
-#overlayPageContent .mCSB_scrollTools .mCSB_buttonUp,
-#overlayPageContent .mCSB_scrollTools .mCSB_buttonDown,
-#overlayPageContent .mCSB_scrollTools .mCSB_buttonLeft,
-#overlayPageContent .mCSB_scrollTools .mCSB_buttonRight,
 .app-list .mCSB_scrollTools,
+#overlayPageContent .mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar,
 .app-list .mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar,
+#overlayPageContent .mCSB_scrollTools .mCSB_buttonUp,
 .app-list .mCSB_scrollTools .mCSB_buttonUp,
+#overlayPageContent .mCSB_scrollTools .mCSB_buttonDown,
 .app-list .mCSB_scrollTools .mCSB_buttonDown,
+#overlayPageContent .mCSB_scrollTools .mCSB_buttonLeft,
 .app-list .mCSB_scrollTools .mCSB_buttonLeft,
+#overlayPageContent .mCSB_scrollTools .mCSB_buttonRight,
 .app-list .mCSB_scrollTools .mCSB_buttonRight {
   -webkit-transition: none;
   transition: none;
@@ -700,6 +727,7 @@ a.menu-item:hover {
   width: 0px;
   overflow: hidden;
 }
+/* User Logout */
 .logout-content {
   padding: 10px;
   width: 350px;
@@ -754,6 +782,9 @@ a.menu-item:hover {
 .app-settings {
   background: #FFFFFF;
 }
+/*************************************************/
+/******** View styles (List/Edit/Detail..) *******/
+/*************************************************/
 .viewContent .content-area {
   padding-left: 50px;
 }
@@ -791,7 +822,6 @@ a.menu-item:hover {
 .fieldValue .value {
   max-width: 85%;
   display: inline-block;
-  word-break: break-word;
 }
 .modal-header button.close {
   padding: 0;
@@ -865,6 +895,9 @@ input[type="password"].inputElement {
   padding-right: 20px;
   padding-left: 20px;
 }
+/**********************************/
+/**** Side vertical Nav styles ****/
+/**********************************/
 .module-nav {
   background: #fff;
   z-index: 1004;
@@ -880,6 +913,9 @@ input[type="password"].inputElement {
   left: 0;
   transition: 0s width;
 }
+.module-nav:hover {
+  /*z-index: 1001;*/
+}
 .modules-menu ul {
   list-style: none;
   margin-left: 0;
@@ -914,7 +950,7 @@ input[type="password"].inputElement {
   float: left;
   font-size: 20px;
 }
-.modules-menu ul li a>span {
+.modules-menu ul li a > span {
   margin-left: 10px;
   vertical-align: middle;
   font-size: 13px;
@@ -954,6 +990,7 @@ input[type="password"].inputElement {
   width: 100%;
   left: 0%;
 }
+/** Lists Menu in Side bar */
 .module-filters .settings-sidebar,
 .module-filters .sidebar-container {
   padding: 0 12px;
@@ -987,6 +1024,7 @@ input[type="password"].inputElement {
 .lists-menu-container hr {
   margin: 5px 0;
 }
+/* mScrollbar customization for lists widget */
 .lists-menu-container .menu-scroller .mCSB_scrollTools {
   width: 13px;
 }
@@ -998,8 +1036,10 @@ input[type="password"].inputElement {
 .modules-menu .mCSB_scrollTools .mCSB_draggerContainer {
   left: 8px;
 }
+/* Customization ends */
 .lists-menu-container .list-menu-content .more-less-link {
   color: #fff;
+  /*text-decoration: none;*/
 }
 .lists-menu-container .list-menu-content .sub-header {
   color: #ddd;
@@ -1104,9 +1144,11 @@ input[type="password"].inputElement {
 .common-links-container > div a {
   color: #fff;
 }
+/*Search Container styles */
 .search-container {
   min-height: 300px;
   position: absolute;
+  /*z-index: 1030;*/
   width: 100%;
   top: 0;
   background: #FBFBFB;
@@ -1125,6 +1167,7 @@ input[type="password"].inputElement {
 .footer p {
   margin: 5px 0;
 }
+/*** Utilities ***/
 .showElement {
   display: block !important;
   height: 100%;
@@ -1247,11 +1290,11 @@ ul.unstyled {
 }
 .emptyRecordsDiv .emptyRecordsContent {
   display: inline-block;
-  font-size: 16px;
   left: 50%;
   margin-left: -25%;
   position: absolute;
   width: 50%;
+  font-size: 16px;
 }
 .textOverflowEllipsis {
   overflow: hidden;
@@ -1276,6 +1319,9 @@ ul.unstyled {
 .removeNoFileChosen {
   color: transparent !important;
 }
+/***********************************
+**********Button Styles**********
+***********************************/
 .module-buttons-container {
   float: right;
   margin-right: 10px;
@@ -1297,6 +1343,7 @@ ul.unstyled {
   margin: 4px 2px;
   border-radius: 2px;
   border: 1px solid #ddd;
+  text-transform: uppercase;
   color: #666;
   background: #fff;
 }
@@ -1317,6 +1364,9 @@ ul.unstyled {
   color: #FFFFFF !important;
   background: #5bc0de !important;
 }
+/***********************************
+**********List View Styles**********
+***********************************/
 .fa.pull-left {
   margin-right: 0;
 }
@@ -1351,7 +1401,7 @@ ul.unstyled {
   font-size: 20px;
 }
 .listview-pagination .disabled {
-  color: rgba(0,0,0,0.2);
+  color: rgba(0, 0, 0, 0.2);
 }
 .listview-pagination .disabled:hover {
   cursor: default;
@@ -1379,6 +1429,8 @@ ul.unstyled {
 .listview-table {
   margin-bottom: 0;
   border-top: 0;
+  /* Horizontal scroll will not work if table layout Fixed */
+  /*    table-layout: fixed;*/
 }
 .listview-table tr td,
 .listview-table tr th {
@@ -1408,7 +1460,7 @@ ul.unstyled {
   width: 100%;
 }
 .listViewEntries .relatedListEntryValues .fieldValue .value,
-.listViewEntries  .listViewEntryValue .fieldValue .value {
+.listViewEntries .listViewEntryValue .fieldValue .value {
   vertical-align: middle;
   width: 100%;
   display: inline-block;
@@ -1423,7 +1475,7 @@ ul.unstyled {
 }
 .listview-table-norecords .table-actions,
 .listview-table .table-actions {
-  width: 120px;
+  width: 110px;
   font-size: 15px;
   color: #555;
   margin-left: 7px;
@@ -1489,13 +1541,13 @@ input[type=checkbox]:checked {
   vertical-align: middle;
   display: table-cell;
 }
-.listview-table  tr.searchRow th {
+.listview-table tr.searchRow th {
   padding: 5px 3px;
 }
-.listview-table  tr.searchRow th.inline-search-btn {
+.listview-table tr.searchRow th.inline-search-btn {
   padding: 3px 10px;
 }
-.listview-table  tr.searchRow th.inline-search-btn button {
+.listview-table tr.searchRow th.inline-search-btn button {
   text-align: center;
   width: 85%;
   text-shadow: none;
@@ -1523,6 +1575,18 @@ input[type=checkbox]:checked {
   background-color: #FFEEEE !important;
   background-image: none !important;
 }
+/*.floatThead-wrapper .table-container{
+    z-index: 0 !important;
+}*/
+/* List view bottom fixed scroll */
+/*.bottom-fixed-scroll{
+    height: 14px;
+    position: relative;
+    top: -15px;
+    overflow-x: auto;
+    overflow-y: hidden;
+    width: 100%;
+}*/
 .scroller-div {
   height: 1px;
 }
@@ -1644,12 +1708,12 @@ input[type=checkbox]:checked {
 #listColumnFilterContainer .disabled i {
   color: #ccc;
 }
+/**********************************
+**********Detail View Styles**********
+**********************************/
 .detailViewButtoncontainer {
   padding-top: 5px;
 }
-.detailViewButtoncontainer button.btn {
-  margin: 0px 1px !important;
-}
 .detailview-header .recordBasicInfo > .info-row {
   margin-bottom: 4px;
 }
@@ -1730,9 +1794,6 @@ th {
   margin-top: 3%;
   margin-right: 2%;
 }
-.overlayDetailHeader button.btn {
-  margin: 0px 1px !important;
-}
 .referencefield-wrapper .createReferenceRecord {
   float: left;
   margin-left: 5px;
@@ -1972,10 +2033,10 @@ th {
   z-index: 1030;
 }
 .overlay-container-60 {
-  margin-left: 42px;
+  margin-left: 42px ;
 }
 .overlay-container-300 {
-  margin-left: 230px;
+  margin-left: 230px ;
 }
 .overlayPageContent {
   background: #FFFFFF;
@@ -2098,6 +2159,9 @@ th {
   height: 26px;
   line-height: 25px;
 }
+/**********************************
+**********Summary View Styles******
+**********************************/
 .summary-table {
   width: 100%;
   table-layout: fixed;
@@ -2218,33 +2282,33 @@ th {
   opacity: 1;
   cursor: pointer;
 }
-.details.row >form .social-media-toggle {
+.details.row > form .social-media-toggle {
   position: absolute;
   right: -15px;
   display: inline-block;
   width: 500px;
   border-left: 0px;
 }
-.details.row >form .social-media-widget {
+.details.row > form .social-media-widget {
   border-left: 1px solid #ddd;
   border-bottom: 1px solid #ddd;
   height: 100%;
   background: white;
 }
-.details.row >form div[class*="col-"].resizable-summary-view {
+.details.row > form div[class*="col-"].resizable-summary-view {
   padding-left: 0;
   padding-right: 0px;
 }
-.details.row >form>div[class*="col-"],
-.details.row >form .resizable-summary-view div[class*="col-"] {
+.details.row > form > div[class*="col-"],
+.details.row > form .resizable-summary-view div[class*="col-"] {
   padding-right: 0;
   padding: 0px 5px;
 }
-.details.row >form>div[class*="col-"]:first-child,
-.details.row >form .left-block {
+.details.row > form > div[class*="col-"]:first-child,
+.details.row > form .left-block {
   padding-left: 0 !important;
 }
-.details.row >form>div[class*="col-"]:last-child {
+.details.row > form > div[class*="col-"]:last-child {
   padding-right: 0;
 }
 .summaryWidgetContainer .noContent {
@@ -2257,6 +2321,9 @@ th {
 .caseReplyArea .nav > li {
   padding: 0 10px;
 }
+/**********************************
+**********Edit View Styles*******
+**********************************/
 .main-container .editViewModNavigator.module-nav,
 .editViewModNavigator .mod-switcher-container,
 .editViewModNavigator .modules-menu {
@@ -2297,7 +2364,7 @@ th {
   width: 100%;
 }
 .editViewContents .input-group {
-  width: 229px;
+  width: 208px;
   float: left;
 }
 .input-group.inputElement .input-group-addon {
@@ -2376,6 +2443,9 @@ th {
   z-index: 1000;
   padding: 7px;
 }
+/**********************************
+**********Advance Search styles**********
+**********************************/
 .op0.fadeInx {
   opacity: 1;
 }
@@ -2448,7 +2518,11 @@ th {
 }
 .btn + input {
   margin-left: 5px;
+  /*    margin-top : 3px;*/
 }
+/**********************************
+**********Extension Store Styles**********
+**********************************/
 .extensionstore .app-trigger {
   width: 98%;
 }
@@ -2479,6 +2553,9 @@ th {
 .extensionContents .extensionError {
   color: #F10404;
 }
+/**********************************
+**********Extension Store Nav Bar**********
+**********************************/
 .tabbable-line > .nav-tabs {
   border: none;
   margin: 0px;
@@ -2547,6 +2624,9 @@ th {
 .extensionContents .listview-table {
   width: 100%;
 }
+/*******************************************
+******Detail View related list styles*******
+********************************************/
 .relatedContents .listViewContentHeaderValues:hover {
   text-decoration: none;
   color: #333;
@@ -2604,6 +2684,9 @@ th {
 .relatedViewActions .btn-group {
   margin-right: 15px;
 }
+/*******************************************
+****************** Modal *******************
+********************************************/
 .modal-header {
   padding: 5px 15px;
   background: #596875;
@@ -2631,6 +2714,7 @@ th {
   width: 100%;
   float: left;
   background: #596875;
+  /*    height: 100%;*/
 }
 .settings-menu {
   display: inline-block;
@@ -2647,7 +2731,7 @@ th {
   cursor: n-resize;
 }
 .settings-menu-items {
-  box-shadow: 0 1px 1px rgba(0,0,0,0.05);
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
   margin-bottom: 10px;
   text-align: justify;
 }
@@ -2765,9 +2849,6 @@ th {
 .active .stepNum {
   color: #FFFFFF;
 }
-.mailBoxEditDiv .crumbs li {
-  width: 22%;
-}
 .stepNum {
   display: inline-block;
   padding: 0 5px;
@@ -2776,6 +2857,7 @@ th {
   vertical-align: middle;
   color: #3399ff;
 }
+/* .squaredFour */
 .squaredFour {
   width: 20px;
   position: relative;
@@ -2789,9 +2871,9 @@ th {
   top: 0;
   left: 0;
   background: #fcfff4;
-  background: linear-gradient(top,#fcfff4 0%,#dfe5d7 40%,#b3bead 100%);
+  background: linear-gradient(top, #fcfff4 0%, #dfe5d7 40%, #b3bead 100%);
   border-radius: 4px;
-  box-shadow: inset 0px 1px 1px white, 0px 1px 3px rgba(0,0,0,0.5);
+  box-shadow: inset 0px 1px 1px white, 0px 1px 3px rgba(0, 0, 0, 0.5);
 }
 .squaredFour label:after {
   content: '';
@@ -2819,13 +2901,16 @@ th {
 .importBlockContainer {
   color: #596875;
 }
+/******************************************* 
+************* Social Buttons *************** 
+********************************************/
 .btn-block + .btn-block {
   margin-top: 5px;
 }
 .btn-google-plus {
   color: #FFFFFF !important;
   background-color: #DD4B39;
-  border-color: rgba(0,0,0,0.2);
+  border-color: rgba(0, 0, 0, 0.2);
 }
 .btn-social {
   position: relative;
@@ -2844,15 +2929,18 @@ th {
   line-height: 34px;
   font-size: 1.6em;
   text-align: center;
-  border-right: 1px solid rgba(0,0,0,0.2);
+  border-right: 1px solid rgba(0, 0, 0, 0.2);
 }
+/******************************************* 
+************* Updates Timeline *************** 
+********************************************/
 .recentActivitiesContainer .history {
   margin: 0 auto;
   padding: 20px 20px 1px;
   max-width: 100%;
   overflow-x: visible;
-  -webkit-transition: opacity .2s ease-out;
-  transition: opacity .2s ease-out;
+  -webkit-transition: opacity 0.2s ease-out;
+  transition: opacity 0.2s ease-out;
 }
 .updates_timeline {
   padding-top: 20px;
@@ -2861,6 +2949,7 @@ th {
   padding: 0;
   list-style: none;
 }
+/* The line */
 .updates_timeline:before {
   content: '';
   position: absolute;
@@ -2879,6 +2968,7 @@ th {
   min-height: 40px;
   z-index: 2;
 }
+/* Left Content(Time) */
 .updates_timeline > li .update_time {
   position: absolute;
   margin: 0;
@@ -2890,6 +2980,7 @@ th {
   font-size: 15px;
   font-style: italic;
 }
+/* Right content(Update info) */
 .updates_timeline > li .update_info {
   padding: 10px 10px 1px;
   display: block;
@@ -2898,10 +2989,11 @@ th {
   position: relative;
   top: -45px;
 }
-.updates_timeline > li .update_info >h3 {
+.updates_timeline > li .update_info > h3 {
   font-size: 1.1em;
   margin-left: -3%;
 }
+/* The icons  */
 .updates_timeline > li .update_icon {
   position: relative;
   border-radius: 50%;
@@ -2914,6 +3006,7 @@ th {
   color: #fff;
   line-height: 35px;
 }
+/* More Button */
 .updates_timeline #more_button .update_icon {
   position: relative;
   border-radius: 0;
@@ -3021,6 +3114,9 @@ th {
   vertical-align: super;
   font-size: 13px;
 }
+/******************************************* 
+************* Task Management ************** 
+********************************************/
 #taskManagementContainer .data-body {
   margin-bottom: 50px;
 }
@@ -3083,15 +3179,16 @@ th {
 #taskManagementContainer .other-details {
   color: #979797;
 }
+/*overwriting jquery ui css*/
 .ui-menu {
   z-index: 10000;
 }
 #taskManagementContainer button.active {
   background: #3B83F7;
   color: white;
-  text-shadow: 0 1px rgba(0,0,0,0.3);
+  text-shadow: 0 1px rgba(0, 0, 0, 0.3);
   border: 1px solid #135fd7;
-  box-shadow: inset 0 1px 2px rgba(0,0,0,0.3);
+  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.3);
 }
 .taskSubject {
   width: 99%;
@@ -3099,6 +3196,9 @@ th {
 #taskManagementContainer .mCustomScrollbar .mCSB_inside > .mCSB_container {
   margin-right: 13px;
 }
+/******************************************* 
+************* Settings Page ************** 
+********************************************/
 .settingsPageDiv.content-area {
   margin-right: 0;
 }
@@ -3132,6 +3232,9 @@ th {
 .settingsgroup-accordion a i {
   margin-right: 5px;
 }
+.settingsgroup-accordion a span {
+  text-transform: uppercase;
+}
 .settingsgroup {
   background: #2C3B49;
   height: 100%;
@@ -3288,35 +3391,59 @@ th {
 }
 .mini-slider-control[data-value="0"] .ui-slider-handle {
   background: #7d7e7d;
-  background: -moz-linear-gradient(top,#7d7e7d 0%,#0e0e0e 100%);
-  background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#7d7e7d),color-stop(100%,#0e0e0e));
-  background: -webkit-linear-gradient(top,#7d7e7d 0%,#0e0e0e 100%);
-  background: -o-linear-gradient(top,#7d7e7d 0%,#0e0e0e 100%);
-  background: -ms-linear-gradient(top,#7d7e7d 0%,#0e0e0e 100%);
-  background: linear-gradient(to bottom,#7d7e7d 0%,#0e0e0e 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#7d7e7d',endColorstr='#0e0e0e',GradientType=0);
+  /* Old browsers */
+  background: -moz-linear-gradient(top, #7d7e7d 0%, #0e0e0e 100%);
+  /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #7d7e7d), color-stop(100%, #0e0e0e));
+  /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #7d7e7d 0%, #0e0e0e 100%);
+  /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top, #7d7e7d 0%, #0e0e0e 100%);
+  /* Opera 11.10+ */
+  background: -ms-linear-gradient(top, #7d7e7d 0%, #0e0e0e 100%);
+  /* IE10+ */
+  background: linear-gradient(to bottom, #7d7e7d 0%, #0e0e0e 100%);
+  /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#7d7e7d', endColorstr='#0e0e0e', GradientType=0);
+  /* IE6-9 */
   margin-left: 0px;
 }
 .mini-slider-control[data-value="1"] .ui-slider-handle {
   background: #ffb76b;
-  background: -moz-linear-gradient(top,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#ffb76b),color-stop(0%,#ffa73d),color-stop(49%,#ff7c00),color-stop(100%,#ff7f04));
-  background: -webkit-linear-gradient(top,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  background: -o-linear-gradient(top,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  background: -ms-linear-gradient(top,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  background: linear-gradient(to bottom,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffb76b',endColorstr='#ff7f04',GradientType=0);
+  /* Old browsers */
+  background: -moz-linear-gradient(top, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffb76b), color-stop(0%, #ffa73d), color-stop(49%, #ff7c00), color-stop(100%, #ff7f04));
+  /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* Opera 11.10+ */
+  background: -ms-linear-gradient(top, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* IE10+ */
+  background: linear-gradient(to bottom, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffb76b', endColorstr='#ff7f04', GradientType=0);
+  /* IE6-9 */
   margin-left: -6px;
 }
 .mini-slider-control[data-value="2"] .ui-slider-handle {
   background: #bfd255;
-  background: -moz-linear-gradient(top,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#bfd255),color-stop(79%,#8eb92a),color-stop(100%,#72aa00),color-stop(100%,#9ecb2d));
-  background: -webkit-linear-gradient(top,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  background: -o-linear-gradient(top,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  background: -ms-linear-gradient(top,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  background: linear-gradient(to bottom,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bfd255',endColorstr='#9ecb2d',GradientType=0);
+  /* Old browsers */
+  background: -moz-linear-gradient(top, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #bfd255), color-stop(79%, #8eb92a), color-stop(100%, #72aa00), color-stop(100%, #9ecb2d));
+  /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* Opera 11.10+ */
+  background: -ms-linear-gradient(top, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* IE10+ */
+  background: linear-gradient(to bottom, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bfd255', endColorstr='#9ecb2d', GradientType=0);
+  /* IE6-9 */
   margin-left: -13px;
 }
 .ModulemanagerSettings .moduleblock .hiden {
@@ -3341,10 +3468,13 @@ th {
 th {
   padding: 6px;
 }
+/******************************************* 
+********** CustomerPortal styles start ********
+********************************************/
 .cp-tabs .enabledModules {
   display: inline-block ! important;
-  margin-left: 4px !important;
-  margin-right: 4px !important;
+  margin-left: 4px!important;
+  margin-right: 4px!important;
   vertical-align: top;
 }
 .drag-portal-module {
@@ -3451,7 +3581,7 @@ th {
   margin-left: 5px;
 }
 .portal-field-delete {
-  margin-left: 45px !important;
+  margin-left: 45px!important;
 }
 .portalModuleRow {
   border-left: 4px solid #F1C40F !important;
@@ -3468,7 +3598,7 @@ th {
   content: "*";
   color: red;
 }
-.nav-tabs .cp-modules > .active >a,
+.nav-tabs .cp-modules > .active > a,
 .nav-tabs .cp-modules > .active > a:hover {
   border: 0px !important;
   border-top-right-radius: 0px;
@@ -3630,7 +3760,7 @@ th {
   display: inline-block;
 }
 .quickPreview .updates_timeline:before {
-  background: #e6e6e6;
+  background: #e5e5e5;
   width: 2px;
   margin-left: -1%;
 }
@@ -3645,13 +3775,16 @@ th {
 .quickPreviewComments .recentComments .commentDetails .comment {
   line-height: 15px;
 }
-.quickPreviewComments  .summaryWidgetContainer {
+.quickPreviewComments .summaryWidgetContainer {
   border: 0;
   padding: 0;
 }
 .quickPreview .recentActivitiesContainer .history {
   padding: 0;
 }
+/******************************************* 
+********** Calendar view styles ************
+********************************************/
 .calendar-sidebar {
   width: 100% !important;
 }
@@ -3808,6 +3941,11 @@ th {
   display: inline-block;
   text-align: center;
 }
+/******************************************* 
+********** Calendar view styles end ********
+
+********** Documents Module styles *********
+********************************************/
 .dragdrop-dotted {
   border: 2px dashed #C0C0C0;
   min-width: 300px;
@@ -3867,13 +4005,16 @@ tr.file > td.fileOwnerData {
   width: 100px;
   white-space: pre-wrap;
 }
+/******************************************* 
+********** Documents Module styles end *****
+********************************************/
 .engagementsContainer .engagements_content {
   padding-top: 15px;
 }
 .summaryWidgetContainer .engagementsContainer table {
   width: inherit;
 }
-.engagements_content table thead>tr:first-child {
+.engagements_content table thead > tr:first-child {
   border: 1px solid #CCC;
   background-color: #F5F5F5;
 }
@@ -3924,6 +4065,9 @@ tr.file > td.fileOwnerData {
   font-size: 15px;
   padding: 1% 0;
 }
+/******************************************* 
+********** Mailroom view styles start ********
+********************************************/
 .mailroomBanner {
   margin: 23px 0;
   height: 215px;
@@ -4132,6 +4276,7 @@ tr.file > td.fileOwnerData {
   margin-left: 0;
 }
 .mentionMessages .mention_follow_up {
+  /*//load this color from variable.less*/
   background-color: green;
 }
 .modelContainer .modal-content {
@@ -4280,6 +4425,7 @@ form[name="notification_settings"] .select2-choice {
   margin-left: 0;
 }
 .mentionMessages .mention_follow_up {
+  /*//load this color from variable.less*/
   background-color: green;
 }
 .modal-content .mention_followup .row {
@@ -4311,6 +4457,9 @@ form[name="notification_settings"] .select2-choice {
 .mentionMessageHeader .MultiFile-remove {
   color: #FFFFFF;
 }
+/******************************************* 
+********** Mailroom view styles end ********
+********************************************/
 .detailview-header {
   margin-bottom: 10px;
 }
@@ -4326,6 +4475,7 @@ form[name="notification_settings"] .select2-choice {
   margin: 0px 10px;
   text-decoration: underline !important;
   color: #3498DB;
+  /*font-size : 12px;*/
 }
 .tag {
   display: inline-block;
@@ -4409,11 +4559,10 @@ form[name="notification_settings"] .select2-choice {
   border: 1px solid #dcdcdc;
 }
 #tagCloud .tag {
-  color: #5ea9dd;
-  padding: 0px;
   background-color: #FFFFFF;
   border-color: #FFFFFF;
   border-radius: 0px;
+  color: #5ea9dd;
   margin: 3px;
 }
 #tagCloud .tag[data-type="public"] {
@@ -4424,6 +4573,9 @@ form[name="notification_settings"] .select2-choice {
   max-width: 80px;
   vertical-align: bottom;
 }
+/******************************************* 
+********** Groups view styles ********
+********************************************/
 #s2id_memberList li > div,
 .groupMembersColors li > div {
   margin-left: 10px;
@@ -4498,6 +4650,12 @@ form[name="notification_settings"] .select2-choice {
   margin: 0px;
   color: #444444;
 }
+/******************************************* 
+********** Groups view styles  ends********
+********************************************/
+/******************************************* 
+********** Picklist Css ********
+********************************************/
 .pickListValue {
   background-color: #FFFFFF;
 }
@@ -4512,6 +4670,12 @@ form[name="notification_settings"] .select2-choice {
   padding: 2px 1px !important;
   line-height: 15px;
 }
+/******************************************* 
+************* Dashboard Styles *************
+********************************************/
+li.dashboardWidget {
+  overflow: auto;
+}
 .dashboardWidgetHeader .title {
   padding-bottom: 10px;
   font-size: 15px;
@@ -4532,9 +4696,6 @@ form[name="notification_settings"] .select2-choice {
 .dashBoardContainer .tabContainer .tab-content {
   margin-top: 10px;
 }
-.dashBoardContainer .dashBoardTabContents ul {
-  margin: 0;
-}
 .dashBoardContainer .dashBoardTabContents ul li {
   border: 3px solid #E2E2E4;
   box-shadow: 1px;
@@ -4601,7 +4762,7 @@ form[name="notification_settings"] .select2-choice {
   display: inline-block;
   opacity: 1;
 }
-.dashBoardContainer .tabContainer li a  .deleteTab:hover {
+.dashBoardContainer .tabContainer li a .deleteTab:hover {
   cursor: pointer;
 }
 #minilistWizardContainer .fieldLabel {
@@ -4638,6 +4799,9 @@ form[name="notification_settings"] .select2-choice {
   resize: none;
   width: 100%;
 }
+/******************************************* 
+********** Picklist DependencyGraph ********
+********************************************/
 #dependencyGraph .tableHeading {
   text-align: center;
   padding-top: 30px;
@@ -4663,12 +4827,15 @@ form[name="notification_settings"] .select2-choice {
 #dependencyGraph .dependencyMapping .pickListDependencyTable .selectedCell {
   background: #a9cbf5;
 }
+/******************************************* 
+********** Rewriting select2 for consistency********
+********************************************/
 .select2-container .select2-choice {
   height: 29px;
   border-radius: 1px;
 }
 .modal {
-  z-index: 1100;
+  z-index: 1070;
 }
 .select2-container .select2-choice {
   height: 28px;
@@ -4756,6 +4923,7 @@ hr {
   position: fixed;
   bottom: 0;
   background: #EFEFEF;
+  /*width:100%;*/
   border-left: 42px solid #2c3b49;
   height: 60px;
   left: 0;
@@ -4774,7 +4942,6 @@ hr {
 }
 .settingsPageDiv .modal-overlay-footer {
   margin-left: 230px;
-  border-left: 0px solid;
 }
 .settingsOverlayContainer .modal-overlay-footer {
   margin: 0;
@@ -4797,14 +4964,14 @@ hr {
   vertical-align: middle;
   margin-top: 6px;
 }
-.list-menu-content .pull-right>.dropdown-menu {
+.list-menu-content .pull-right > .dropdown-menu {
   left: -126px;
   position: relative;
 }
-.dropdown-menu>li>a {
+.dropdown-menu > li > a {
   padding: 4px 6px;
 }
-.dropdown-menu>li>a span i {
+.dropdown-menu > li > a span i {
   font-size: 15px;
   vertical-align: middle;
 }
@@ -4812,11 +4979,11 @@ hr {
   max-height: 300px;
   padding-left: 0;
 }
-.related-tabs .dropdown-menu>.mCustomScrollBox>.mCSB_container {
+.related-tabs .dropdown-menu > .mCustomScrollBox > .mCSB_container {
   margin-right: 0;
   padding: 4px 6px;
 }
-.related-tabs .dropdown-menu>.mCustomScrollBox>.mCSB_container>li>a {
+.related-tabs .dropdown-menu > .mCustomScrollBox > .mCSB_container > li > a {
   display: block;
   padding: 3px 5px;
   clear: both;
@@ -4825,7 +4992,7 @@ hr {
   color: #333;
   white-space: nowrap;
 }
-.related-tabs .dropdown-menu>.mCustomScrollBox>.mCSB_container span i {
+.related-tabs .dropdown-menu > .mCustomScrollBox > .mCSB_container span i {
   font-size: 15px;
   vertical-align: middle;
 }
@@ -4848,16 +5015,16 @@ hr {
 .calendar-sidebar .calendar-sidebar-tabs.padding {
   padding-left: 20px !important;
 }
-.related-tabs.row .nav>li {
+.related-tabs.row .nav > li {
   padding: 0 10px;
   margin: 0 2px;
 }
-.massEditTabs.nav>li {
+.massEditTabs.nav > li {
   padding: 0 10px;
   margin: 0 4px;
 }
-.row .nav>li>a,
-.row .nav>li>a:hover {
+.row .nav > li > a,
+.row .nav > li > a:hover {
   padding: 10px 3px;
   border: none;
   vertical-align: bottom;
@@ -4867,38 +5034,39 @@ hr {
   -webkit-box-sizing: border-box;
   -o-box-sizing: border-box;
 }
-.row .nav>li>a:hover {
+.row .nav > li > a:hover {
   border-bottom-color: #555;
 }
-TN-34230
-
-.row .nav>li>a:hover {
+/*.row ul{
+    padding:0;
+}*/
+TN-34230 .row .nav > li > a:hover {
   border-bottom-color: #555;
   background: none;
 }
 .row ul li:first-child {
   margin-left: 0;
 }
-.related-tabs .nav-tabs>li.active,
-.related-tabs .nav-tabs>li:hover,
-.related-tabs .nav-tabs>li.active:focus,
-.dashBoardContainer .nav-tabs>li.active,
-.dashBoardContainer .nav-tabs>li:hover,
-.dashBoardContainer .nav-tabs>li.active:focus,
-.contents.tabbable .nav-tabs>li.active,
-.contents.tabbable .nav-tabs>li:hover,
-.contents.tabbable .nav-tabs>li.active:focus {
+.related-tabs .nav-tabs > li.active,
+.dashBoardContainer .nav-tabs > li.active,
+.contents.tabbable .nav-tabs > li.active,
+.related-tabs .nav-tabs > li:hover,
+.dashBoardContainer .nav-tabs > li:hover,
+.contents.tabbable .nav-tabs > li:hover,
+.related-tabs .nav-tabs > li.active:focus,
+.dashBoardContainer .nav-tabs > li.active:focus,
+.contents.tabbable .nav-tabs > li.active:focus {
   border: none;
   border-bottom: 3px solid #555;
 }
-.nav-tabs>li.active>a,
-.nav-tabs>li.active>a:hover,
-.nav-tabs>li.active>a:focus,
-.nav-tabs>li>a {
+.nav-tabs > li.active > a,
+.nav-tabs > li.active > a:hover,
+.nav-tabs > li.active > a:focus,
+.nav-tabs > li > a {
   border: 0;
 }
-.nav>li>a:hover,
-.nav>li>a:focus {
+.nav > li > a:hover,
+.nav > li > a:focus {
   background-color: #FFFFFF;
 }
 .fa-pencil,
@@ -4908,6 +5076,9 @@ TN-34230
 .commentAttachmentName {
   font-size: 11px;
 }
+/******************************************* 
+********** Layout Editor ********
+********************************************/
 .marginBottom10px {
   margin-bottom: 10px;
 }
@@ -4930,6 +5101,7 @@ TN-34230
 }
 .zeroOpacity {
   opacity: 0;
+  /*for IE*/
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
   filter: alpha(opacity=0);
 }
@@ -4956,10 +5128,12 @@ TN-34230
 .layoutContent .opacity:hover .actions {
   opacity: 1;
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
+  /*for IE*/
   filter: alpha(opacity=100);
 }
 .layoutContent .fieldPropertyContainer:hover .actions {
   opacity: 1;
+  /*for IE*/
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
   filter: alpha(opacity=100);
 }
@@ -4982,6 +5156,7 @@ TN-34230
 .relatedTabModulesList .addButton {
   border-radius: 2px;
   border: 1px solid #DDDDDD;
+  text-transform: uppercase;
   color: #666666;
   background: #FFFFFF;
 }
@@ -5055,6 +5230,9 @@ TN-34230
   margin-left: 5px;
   word-break: break-all;
 }
+/******************************************* 
+************** Tax Management **************
+********************************************/
 #TaxCalculationsContainer .table tr:first-child,
 .taxModalContainer #editTax .table tr:first-child {
   border-bottom: 1px solid #ccc;
@@ -5094,6 +5272,9 @@ TN-34230
   max-height: 500px;
   overflow-y: auto;
 }
+/******************************************* 
+********** Workflows ********
+********************************************/
 #workflow_edit .editViewBody {
   overflow: inherit;
 }
@@ -5103,7 +5284,7 @@ TN-34230
 }
 .timePicker {
   width: 9.5em !important;
-  z-index: 1101 !important;
+  z-index: 1070 !important;
 }
 .weekDaySelect .ui-state-default {
   background: inherit;
@@ -5141,75 +5322,6 @@ TN-34230
 .module-filters.active {
   background: #F7F7F7;
 }
-.payment-type-selection {
-  margin-bottom: 30px;
-}
-.payment-type-selection img {
-  vertical-align: middle;
-}
-.currplan {
-  padding: 10px 20px;
-  background-color: #f3f3f3;
-  border: 1px solid #eee;
-  border-radius: 3px;
-}
-.currplan div {
-  display: inline-block;
-  font-size: 16px;
-}
-.planName {
-  display: inline-block;
-  color: #fff;
-  padding: 20px;
-  margin: 10px 20px;
-  font-size: 24px;
-  border-radius: 2px;
-}
-.plan-heading {
-  min-height: 168px;
-}
-.plan-title {
-  color: #fff;
-  font-size: 20px;
-  padding: 13px 0;
-}
-#sales_plan {
-  background: #3FC380;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#salespremium_plan {
-  background: #00B16A;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#support_plan {
-  background: #2980B9;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#supportpremium_plan {
-  background: #2980B9;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#ultimate_plan,
-#exclusive_plan {
-  background: #F39C12;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#contact_plan {
-  background: #FF5959;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
 .workflowListContainer .select2-container .select2-choice {
   height: 36px;
 }
@@ -5224,6 +5336,7 @@ TN-34230
 .contactAdd {
   border: 1px solid #eee;
   padding: 20px;
+  /*min-height: 310px !important;*/
 }
 #subDetails table td {
   padding: 7px 10px;
@@ -5346,9 +5459,9 @@ TN-34230
 .productBundles {
   padding-left: 20px;
 }
-.nav .open>a,
-.nav .open>a:hover,
-.nav .open>a:focus {
+.nav .open > a,
+.nav .open > a:hover,
+.nav .open > a:focus {
   color: #000000;
   background-color: #FFFFFF;
 }
@@ -5369,6 +5482,9 @@ TN-34230
   width: 100%;
   overflow-x: auto;
 }
+/******************************************* 
+*************** Mail Manager ***************
+********************************************/
 #mm_searchButton {
   height: 28px;
   background-color: #FFFFFF;
@@ -5424,8 +5540,8 @@ TN-34230
   padding: 1px 5px;
   border-radius: 3px;
   text-align: center;
-  text-shadow: 0 1px rgba(0,0,0,0.1);
-  background-image: -webkit-linear-gradient(top,#DD4B39 0,#D14836 100%);
+  text-shadow: 0 1px rgba(0, 0, 0, 0.1);
+  background-image: -webkit-linear-gradient(top, #DD4B39 0, #D14836 100%);
   border: 1px solid #C6322A;
   background-color: #DD4B39;
 }
@@ -5643,6 +5759,7 @@ TN-34230
 .width40per {
   width: 40%;
 }
+/****** Mail Manager Ends ******/
 .quickCreateContent .massEditTable textarea,
 .addCommentBlock .commentTextArea textarea {
   resize: vertical;
@@ -5655,19 +5772,20 @@ TN-34230
 .select2-container-multi .select2-choices {
   z-index: 1;
 }
-.nav .nav-stacks .cp-nav-header-wrapper>li.disabled>a:hover {
+/****** Customer Portal Settings ******/
+.nav .nav-stacks .cp-nav-header-wrapper > li.disabled > a:hover {
   background-color: #fff;
 }
-.cp-nav-header-wrapper>li.disabled>a:hover {
+.cp-nav-header-wrapper > li.disabled > a:hover {
   border: 0px ! important;
 }
-.nav .nav-stacks .cp-nav-header-wrapper>li.disabled>a {
+.nav .nav-stacks .cp-nav-header-wrapper > li.disabled > a {
   background-color: #fff;
 }
-#portalModulesTable>li.portalModuleRow.active>a:hover {
+#portalModulesTable > li.portalModuleRow.active > a:hover {
   background-color: #fff !important;
 }
-#portalModulesTable>li.portalModuleRow.active>a:focus {
+#portalModulesTable > li.portalModuleRow.active > a:focus {
   background-color: #fff !important;
 }
 .portal-dashboard {
@@ -5766,7 +5884,7 @@ TN-34230
 .portal-dashboard {
   border-bottom: 0px ! important;
 }
-#portal-shortcutsContainer>ul {
+#portal-shortcutsContainer > ul {
   border-bottom: 0px ! important;
 }
 .portalMenuHeader {
@@ -5775,14 +5893,15 @@ TN-34230
 }
 .cp-tabs .enabledModules {
   display: inline-block ! important;
-  margin-left: 4px !important;
-  margin-right: 4px !important;
+  margin-left: 4px!important;
+  margin-right: 4px!important;
   vertical-align: top;
   margin-top: 4px !important;
 }
 .portal-shortcut-list:hover {
   border-bottom: 3px solid transparent ! important;
 }
+/****** Customer Portal Settings ******/
 .label-radio label input[type="radio"] {
   position: relative;
   top: 2px;
@@ -5794,6 +5913,9 @@ TN-34230
 div.tooltip-inner {
   max-width: 400px;
 }
+/******************************************* 
+********** Menu Editor ********
+********************************************/
 .sortable.appContainer.ui-sortable {
   width: 160px;
 }
@@ -5968,7 +6090,7 @@ div.tooltip-inner {
   width: 13px !important;
   margin-top: 8px;
 }
-.detailview-table .input-group-addon+.inputElement.form-control,
+.detailview-table .input-group-addon + .inputElement.form-control,
 .detailview-table .inputElement.form-control.input-medium {
   width: 100%;
 }
@@ -6015,6 +6137,7 @@ div.tooltip-inner {
   float: left;
   margin-right: 5px;
 }
+/***** Oursites Changes *****/
 .portal-table .table-actions {
   width: inherit ! important;
 }
@@ -6026,6 +6149,7 @@ div.tooltip-inner {
   padding: 10px 5px ! important;
   padding-left: 10px ! important;
 }
+/***** Oursites Changes *****/
 .ExtensionscontentsDiv .content-area {
   padding-left: 15px;
   padding-right: 15px;
@@ -6039,14 +6163,14 @@ div.tooltip-inner {
 }
 .blockHeader {
   border-color: #F3F3F4 #F3F3F4 #cbcbcf;
-  border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
   background-color: #474747;
-  background-image: -moz-linear-gradient(top,#555555,#333333);
-  background-image: -ms-linear-gradient(top,#555555,#333333);
-  background-image: -webkit-gradient(linear,0 0,0 100%,from(#555555),to(#333333));
-  background-image: -webkit-linear-gradient(top,#555555,#333333);
-  background-image: -o-linear-gradient(top,#555555,#333333);
-  background-image: linear-gradient(top,#555555,#333333);
+  background-image: -moz-linear-gradient(top, #555555, #333333);
+  background-image: -ms-linear-gradient(top, #555555, #333333);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#333333));
+  background-image: -webkit-linear-gradient(top, #555555, #333333);
+  background-image: -o-linear-gradient(top, #555555, #333333);
+  background-image: linear-gradient(top, #555555, #333333);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#333333', GradientType=0);
   min-height: 30px;
@@ -6139,8 +6263,8 @@ div.tooltip-inner {
 .markStar .starredStatus {
   display: none;
 }
-.nav>li.addDashboardTab>a,
-.nav>li.addDashboardTab>a:hover {
+.nav > li.addDashboardTab > a,
+.nav > li.addDashboardTab > a:hover {
   padding: 10px 15px;
   background: inherit;
 }
@@ -6153,7 +6277,7 @@ div.tooltip-inner {
   height: 960px;
   width: 1260px;
 }
-.nav-tabs>li {
+.nav-tabs > li {
   border-bottom: 3px solid transparent;
   margin: 0 2px;
 }
@@ -6231,16 +6355,14 @@ div.tooltip-inner {
 }
 .select2-container.select2-container-multi.select2,
 .editViewPageDiv .select2-container.select2-container-multi.select2 {
-  height: auto !important;
+  height: auto!important;
 }
-.summaryViewFields .select2-container-multi.inputElement.form-control
-.quickCreateContent .select2-container.select2-container-multi.select2,
+.summaryViewFields .select2-container-multi.inputElement.form-control .quickCreateContent .select2-container.select2-container-multi.select2,
 #massEditContainer .select2-container.select2-container-multi.select2 {
   width: 150px;
   height: auto !important;
 }
-.summaryViewFields .select2-container-multi.inputElement.form-control
-.quickCreateContent .select2-container.select2-container-multi.select2 .input-save-wrap,
+.summaryViewFields .select2-container-multi.inputElement.form-control .quickCreateContent .select2-container.select2-container-multi.select2 .input-save-wrap,
 #massEditContainer .select2-container.select2-container-multi.select2 .input-save-wrap {
   float: right;
   margin-right: 25px;
@@ -6336,6 +6458,7 @@ a.cp-modules:hover {
 #RestrictionsLayout {
   background: #fafafb;
   margin-top: -92px;
+  /*to adjust with page padding top*/
 }
 #RestrictionsLayout .vtImage {
   width: 22%;
@@ -6369,6 +6492,7 @@ a.cp-modules:hover {
 .datepicker {
   z-index: 1100 !important;
 }
+/*****RSS Changes****/
 .feedListContainer .listview-table tr td:first-child,
 .listview-table tr th:first-child {
   width: inherit ! important;
@@ -6376,12 +6500,14 @@ a.cp-modules:hover {
 .feedListContainer .listViewEntries .listViewEntryValue {
   max-width: inherit ! important;
 }
-.ps-container>.ps-scrollbar-y-rail {
+/*****RSS Changes****/
+.ps-container > .ps-scrollbar-y-rail {
   z-index: 1002;
 }
 #relationBlock .recordScroll {
   max-height: 150px;
 }
+/*Start - List sidebar toggle*/
 .essentials-toggle {
   background-color: white;
   font-weight: bold;
@@ -6401,6 +6527,7 @@ a.cp-modules:hover {
 .essentials-toggle .fa-chevron-right {
   background-position: -460px -72px !important;
 }
+/*End - List essentials toggle*/
 .module-name-tooltip .qtip-content {
   font-size: 12px;
   padding: 3px;
@@ -6484,8 +6611,8 @@ li.select2-search-choice div {
 .popover ul.listmenu li {
   padding: 3px;
 }
-.popover-content .disabled>a,
-.popover .disabled>a {
+.popover-content .disabled > a,
+.popover .disabled > a {
   opacity: 0.5;
   cursor: not-allowed;
 }
@@ -6496,6 +6623,7 @@ li.select2-search-choice div {
   -o-transform: rotate(180deg);
   transform: rotate(180deg);
 }
+/*Start - List sidebar toggle*/
 .essentials-toggle {
   background-color: white;
   font-weight: bold;
@@ -6515,6 +6643,7 @@ li.select2-search-choice div {
 .essentials-toggle .fa-chevron-right {
   background-position: -460px -72px !important;
 }
+/*End - List essentials toggle*/
 .module-name-tooltip .qtip-content {
   font-size: 12px;
   padding: 3px;
@@ -6595,16 +6724,16 @@ li.select2-search-choice div {
 #reportDetails .pivot .toptitle.targetY0,
 #reportDetails .pivot .lefttitle.targetX0 {
   border-color: #F3F3F4 #F3F3F4 #cbcbcf;
-  border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
   background-color: #474747;
-  background-image: -moz-linear-gradient(top,#555555,#333333);
-  background-image: -ms-linear-gradient(top,#555555,#333333);
-  background-image: -webkit-gradient(linear,0 0,0 100%,from(#555555),to(#333333));
-  background-image: -webkit-linear-gradient(top,#555555,#333333);
-  background-image: -o-linear-gradient(top,#555555,#333333);
-  background-image: linear-gradient(top,#555555,#333333);
+  background-image: -moz-linear-gradient(top, #555555, #333333);
+  background-image: -ms-linear-gradient(top, #555555, #333333);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#333333));
+  background-image: -webkit-linear-gradient(top, #555555, #333333);
+  background-image: -o-linear-gradient(top, #555555, #333333);
+  background-image: linear-gradient(top, #555555, #333333);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555',endColorstr='#333333',GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#333333', GradientType=0);
   min-height: 30px;
 }
 #reportDetails .pivot th.toptitle.targetY0,
@@ -6646,7 +6775,8 @@ li.select2-search-choice div {
   background: #FFFFFF;
 }
 .templateActions {
-  background: rgba(0,0,0,0.1);
+  background: rgba(0, 0, 0, 0.1);
+  /*padding: 4%;*/
   bottom: 0;
   text-align: center;
   position: absolute;
@@ -6654,6 +6784,9 @@ li.select2-search-choice div {
   zoom: 1;
   width: 100%;
 }
+/*.templateActions i {
+    margin-right: 30px;
+}*/
 .thumbnails > li {
   float: left;
   height: 315px !important;
@@ -6828,9 +6961,10 @@ a.btnReport:hover {
   left: 0px;
 }
 .bx-wrapper .bx-viewport {
-  width:99%;
+  width: 99%;
   left: 0px;
   background: #fff;
+  /*fix other elements on the page moving (on Chrome)*/
   -webkit-transform: translatez(0);
   -moz-transform: translatez(0);
   -ms-transform: translatez(0);
@@ -6888,7 +7022,7 @@ a.btnReport:hover {
 .filter-search-show {
   display: block !important;
 }
-.emailTemplatesPopupTableContainer .listViewEntries  .listViewEntryValue {
+.emailTemplatesPopupTableContainer .listViewEntries .listViewEntryValue {
   max-width: 100%;
   min-width: 150px;
 }
@@ -6923,12 +7057,15 @@ input:focus::-webkit-input-placeholder {
 input:focus:-moz-placeholder {
   color: transparent;
 }
+/* FF 4-18 */
 input:focus::-moz-placeholder {
   color: transparent;
 }
+/* FF 19+ */
 input:focus:-ms-input-placeholder {
   color: transparent;
 }
+/* IE 10+ */
 .global-actions .dropdown-menu:before {
   position: absolute;
   top: -7px;
@@ -6937,7 +7074,7 @@ input:focus:-ms-input-placeholder {
   border-right: 7px solid transparent;
   border-bottom: 7px solid #ccc;
   border-left: 7px solid transparent;
-  border-bottom-color: rgba(0,0,0,0.2);
+  border-bottom-color: rgba(0, 0, 0, 0.2);
   content: '';
 }
 .global-actions .dropdown-menu:after {
@@ -7122,6 +7259,7 @@ input:focus:-ms-input-placeholder {
   text-align: center;
 }
 #OnBoardLayout #OnBoardPageContainer .crmGoals textarea::-webkit-input-placeholder {
+  /* WebKit browsers */
   text-align: center;
   padding: 20%;
   font-size: 12px;
@@ -7267,121 +7405,3 @@ input:focus:-ms-input-placeholder {
   border-left: 3px solid #F1C40F;
   opacity: 1;
 }
-.fieldValue .value a {
-  color: #15c !important;
-}
-.editViewContents .fieldLabel {
-  min-width: 100px;
-  width: 20%;
-  word-break: break-all;
-}
-.editViewContents .fieldValue {
-  width:30%;
-}
-.editViewContents td.fieldValue[colspan="3"] {
-  width:80%;
-}
-.editViewContents textarea.textAreaElement {
-  width: 88%;
-}
-.editViewContents input[type="checkbox"] {
-  width: 15px;
-  height: 15px;
-}
-.editViewContents input[type="radio"] {
-  width: 15px;
-  height: 15px;
-}
-#composeEmailContainer .modal-body .quickCreateContent,
-#QuickCreate .modal-body .quickCreateContent,
-#create .quickCreateContent {
-  margin-top: 25px;
-}
-.settingsgroup-panel .widgetContainer .menuItemLabel .pinUnpinShortCut {
-  display: none;
-  margin-top: 2px;
-}
-.settingsgroup-panel .widgetContainer .menuItemLabel:hover .pinUnpinShortCut {
-  display: inline-block;
-}
-@-moz-document url-prefix() {
-  .duplicateHandlingContainer .tooltip-inner {
-    width: 550px;
-    max-width: 550px;
-  }
-}
-.duplicateHandlingContainer .tooltip-inner {
-  text-align: left !important;
-}
-.duplicateHandlingContainer .syncMessage {
-  margin-top: 5px !important;
-}
-.duplicateHandlingContainer .actionsList {
-  width: 230px !important;
-}
-.duplicationMessageContainer {
-  background-color: #f2dede !important;
-  color: #b94a48 !important;
-}
-.duplicationMessageContainer .duplicationMessageHeader {
-  margin-bottom: 8px;
-}
-.listViewRecordActions .quickView, .listViewRecordActions .markStar,
-.listViewRecordActions .markAsHeld,.listViewRecordActions .holdFollowupOn {
-  margin-top: 4px;
-}
-.app-menu .module-icon .custom-module {
-	font-size: 14px;
-	border-radius: 4px;
-	color: #000;
-	background-color: #fff;
-	padding: 4px 10px 4px 5px !important
-}
-.menu-item .custom-module {
-	font-family: 'OpenSans-Regular', sans-serif;
-	font-size: 12px;
-	border-radius: 4px;
-	padding: 2px;
-	color: #000;
-	background-color: #fff;
-}
-.modules-menu .custom-module {
-	color: #fff;
-	margin-left: 0px;
-	display: inline;
-	border: 1px solid #fff;
-	border-radius: 4px;
-	padding: 3px 4px 3px 2px !important;
-	font-weight: bold;
-}
-#quickCreateModules .custom-module, .workflowListContainer .custom-module, .dashBoardTabContents .custom-module {
-	border-radius: 4px;
-	padding: 3px 5px;
-	color: #fff;
-	background-color: #777;
-}
-.menuEditorItem .custom-module {
-	border-radius: 4px;
-	padding: 3px 5px;
-	color: #000;
-	background-color: #fff;
-}
-.task-details .custom-module {
-	border-radius: 4px;
-	padding: 1px 4px;
-	color: white;
-	background-color: #777;
-}
-.related-tabs .custom-module, #relatedmenuList .custom-module {
-	border-radius: 4px;
-	color: #fff;
-	background-color: #777;
-	padding: 5px 7px;
-	font-weight: bold;
-}
-.record-header .custom-module {
-	font-size: 30px;
-}
-.moduleIcon .custom-module {
-	font-weight: bold;
-}
\ No newline at end of file
diff --git a/layouts/v7/skins/marketing/style.css b/layouts/v7/skins/marketing/style.css
index 3d4202ca4f27901ec3e7c590dccd2f742b283d4d..deaba17193bbac72708d16c564b559382108ac55 100644
--- a/layouts/v7/skins/marketing/style.css
+++ b/layouts/v7/skins/marketing/style.css
@@ -1,7 +1,9 @@
 @font-face {
   font-family: 'Oswald';
   src: url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.eot');
-  src: url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.eot?#iefix') format('embedded-opentype'), url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.woff') format('woff'), url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.ttf') format('truetype'), url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.svg#Oswald') format('svg');
+  /* IE9 Compat Modes */
+  src: url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.svg#Oswald') format('svg');
+  /* Legacy iOS */
   font-weight: normal;
   font-style: normal;
   text-rendering: optimizeLegibility;
@@ -15,27 +17,37 @@ a:active {
 @font-face {
   font-family: 'OpenSans-Regular';
   src: url('../fonts/OpenSans/Regular/OpenSans-Regular.eot');
-  src: url('../fonts/OpenSans/Regular/OpenSans-Regular.ttf') format('truetype'), url('../fonts/OpenSans/Regular/OpenSans-Regular.eot?#iefix') format('embedded-opentype'), url('../fonts/OpenSans/Regular/OpenSans-Regular.woff2') format('woff2'), url('../fonts/OpenSans/Regular/OpenSans-Regular.woff') format('woff'), url('../fonts/OpenSans/Regular/OpenSans-Regular.svg#svgFontName') format('svg');
+  /* IE9 Compat Modes */
+  src: url('../fonts/OpenSans/Regular/OpenSans-Regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/OpenSans/Regular/OpenSans-Regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/OpenSans/Regular/OpenSans-Regular.woff2') format('woff2'), /* Super Modern Browsers */ url('../fonts/OpenSans/Regular/OpenSans-Regular.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/OpenSans/Regular/OpenSans-Regular.svg#svgFontName') format('svg');
+  /* Legacy iOS */
 }
 @font-face {
   font-family: 'OpenSans-Semibold';
   src: url('../fonts/OpenSans/Semibold/OpenSans-Semibold.eot');
-  src: url('../fonts/OpenSans/Semibold/OpenSans-Semibold.ttf') format('truetype'), url('../fonts/OpenSans/Semibold/OpenSans-Semibold.eot?#iefix') format('embedded-opentype'), url('../fonts/OpenSans/Semibold/OpenSans-Semibold.woff2') format('woff2'), url('../fonts/OpenSans/Semibold/OpenSans-Semibold.woff') format('woff'), url('../fonts/OpenSans/Semibold/OpenSans-Semibold.svg#svgFontName') format('svg');
+  /* IE9 Compat Modes */
+  src: url('../fonts/OpenSans/Semibold/OpenSans-Semibold.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/OpenSans/Semibold/OpenSans-Semibold.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/OpenSans/Semibold/OpenSans-Semibold.woff2') format('woff2'), /* Super Modern Browsers */ url('../fonts/OpenSans/Semibold/OpenSans-Semibold.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/OpenSans/Semibold/OpenSans-Semibold.svg#svgFontName') format('svg');
+  /* Legacy iOS */
 }
 @font-face {
   font-family: 'ProximaNova-Regular';
-  src: url('../fonts/ProximanovaWebfont/ProximaNova-Regular.ttf') format('truetype'), url('../fonts/ProximanovaWebfont/ProximaNova-Regular.woff') format('woff'), url('../fonts/ProximanovaWebfont/ProximaNova-Regular.eot?#iefix') format('embedded-opentype');
+  src: url('../fonts/ProximanovaWebfont/ProximaNova-Regular.ttf') format('truetype'), url('../fonts/ProximanovaWebfont/ProximaNova-Regular.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/ProximanovaWebfont/ProximaNova-Regular.eot?#iefix') format('embedded-opentype');
+  /* IE6-IE8 */
+  /* Safari, Android, iOS */
   font-style: normal;
   font-weight: normal;
   text-rendering: optimizeLegibility;
 }
 @font-face {
   font-family: 'ProximaNova-Semibold';
-  src: url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.ttf') format('truetype'), url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.woff') format('woff'), url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.eot?#iefix') format('embedded-opentype');
+  src: url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.eot?#iefix') format('embedded-opentype');
+  /* IE6-IE8 */
   font-style: normal;
   font-weight: normal;
   text-rendering: optimizeLegibility;
 }
+/**********************************/
+/************ Layout **************/
+/**********************************/
 html {
   height: 100%;
   overflow-y: auto;
@@ -102,6 +114,7 @@ body {
 @media (min-width: 992px) {
   .global-nav .logo-container {
     display: inline-block;
+    width: 150px;
     z-index: 2;
     padding-left: 6%;
     margin-top: 1px;
@@ -113,11 +126,13 @@ body {
     position: absolute;
     width: 100%;
     height: 42px;
+    /*        border-top:1px solid #ddd;*/
     border-bottom: 1px solid #ddd;
   }
   .app-nav .module-action-bar .module-action-content {
     background: #FBFBFB;
     height: 41px;
+    /*        border-bottom: 1px solid #eee;*/
   }
   .app-nav .module-action-bar .module-action-content .navbar-right {
     margin-right: 0;
@@ -163,7 +178,7 @@ body {
     padding-left: 0;
   }
 }
-.btn-toolbar >.btn-group:first-child {
+.btn-toolbar > .btn-group:first-child {
   margin-left: 5px;
 }
 .vt-notification {
@@ -196,15 +211,19 @@ body {
 .vt-notification [data-notify="message"] {
   color: #eaeaea;
 }
+/**********************************/
+/******** Navigation styles *******/
+/**********************************/
 .company-logo {
   height: 40px;
+  width: 150px;
   margin: 0 0;
   display: inline-block;
   margin-left: 1px;
 }
 .company-logo img {
-  max-height: 100%;
-  max-width: 100%;
+  height: 100%;
+  width: auto;
 }
 .navbar .fa {
   font-size: 15px;
@@ -214,10 +233,13 @@ body {
   font-size: 16px;
   position: relative;
 }
+/*.module-action-bar .module-action-content #appnav{
+    padding-top:5px;
+}*/
 .global-nav .navbar-nav > li div a {
   padding: 15px;
 }
-.global-nav>ul {
+.global-nav > ul {
   margin-right: 20px;
 }
 .global-nav .search-links-container {
@@ -267,26 +289,28 @@ body {
     float: right;
     height: 42px;
   }
-  .module-action-bar .navbar-right .nav>li {
+  .module-action-bar .navbar-right .nav > li {
     display: inline-block;
   }
-  .module-action-bar .navbar-right .nav>li a {
+  .module-action-bar .navbar-right .nav > li a {
     padding: 0 10px;
   }
   .global-nav .logo-container {
     border-bottom: 0;
+    width: 150px;
   }
 }
 @media (max-width: 991px) {
   .global-nav .logo-container {
     border-bottom: 0;
+    width: 150px;
   }
   .notificationMessageHolder {
     padding-left: 45%;
   }
 }
 @media (min-width: 991px) {
-  .nav>li>a.qc-button {
+  .nav > li > a.qc-button {
     padding: 2px 3px;
     margin-top: 13px;
     margin-right: 15px;
@@ -294,7 +318,7 @@ body {
     color: #fff;
     border-radius: 20px;
   }
-  .nav>li>a.qc-button span {
+  .nav > li > a.qc-button span {
     vertical-align: top;
   }
 }
@@ -313,6 +337,7 @@ body {
   width: 100%;
   height: 100%;
 }
+/** App Nav Styles */
 .active-app-title {
   white-space: nowrap;
   font-family: Oswald, "OpenSans-Semibold", "Helvetica Neue", Helvetica, sans-serif;
@@ -367,7 +392,9 @@ body {
   height: 42px;
   text-align: center;
   line-height: 42px;
+  /*    background-color: #2c3b49;*/
   color: #ffffff;
+  /*border-bottom: 1px solid #272B46;*/
 }
 .app-nav .app-indicator-icon-container .app-indicator-icon {
   font-size: 24px;
@@ -479,16 +506,16 @@ body {
   right: -4px;
 }
 #overlayPageContent .mCSB_scrollTools,
-#overlayPageContent .mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar,
-#overlayPageContent .mCSB_scrollTools .mCSB_buttonUp,
-#overlayPageContent .mCSB_scrollTools .mCSB_buttonDown,
-#overlayPageContent .mCSB_scrollTools .mCSB_buttonLeft,
-#overlayPageContent .mCSB_scrollTools .mCSB_buttonRight,
 .app-list .mCSB_scrollTools,
+#overlayPageContent .mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar,
 .app-list .mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar,
+#overlayPageContent .mCSB_scrollTools .mCSB_buttonUp,
 .app-list .mCSB_scrollTools .mCSB_buttonUp,
+#overlayPageContent .mCSB_scrollTools .mCSB_buttonDown,
 .app-list .mCSB_scrollTools .mCSB_buttonDown,
+#overlayPageContent .mCSB_scrollTools .mCSB_buttonLeft,
 .app-list .mCSB_scrollTools .mCSB_buttonLeft,
+#overlayPageContent .mCSB_scrollTools .mCSB_buttonRight,
 .app-list .mCSB_scrollTools .mCSB_buttonRight {
   -webkit-transition: none;
   transition: none;
@@ -700,6 +727,7 @@ a.menu-item:hover {
   width: 0px;
   overflow: hidden;
 }
+/* User Logout */
 .logout-content {
   padding: 10px;
   width: 350px;
@@ -754,6 +782,9 @@ a.menu-item:hover {
 .app-settings {
   background: #FFFFFF;
 }
+/*************************************************/
+/******** View styles (List/Edit/Detail..) *******/
+/*************************************************/
 .viewContent .content-area {
   padding-left: 50px;
 }
@@ -791,7 +822,6 @@ a.menu-item:hover {
 .fieldValue .value {
   max-width: 85%;
   display: inline-block;
-  word-break: break-word;
 }
 .modal-header button.close {
   padding: 0;
@@ -865,6 +895,9 @@ input[type="password"].inputElement {
   padding-right: 20px;
   padding-left: 20px;
 }
+/**********************************/
+/**** Side vertical Nav styles ****/
+/**********************************/
 .module-nav {
   background: #fff;
   z-index: 1004;
@@ -880,6 +913,9 @@ input[type="password"].inputElement {
   left: 0;
   transition: 0s width;
 }
+.module-nav:hover {
+  /*z-index: 1001;*/
+}
 .modules-menu ul {
   list-style: none;
   margin-left: 0;
@@ -914,7 +950,7 @@ input[type="password"].inputElement {
   float: left;
   font-size: 20px;
 }
-.modules-menu ul li a>span {
+.modules-menu ul li a > span {
   margin-left: 10px;
   vertical-align: middle;
   font-size: 13px;
@@ -954,6 +990,7 @@ input[type="password"].inputElement {
   width: 100%;
   left: 0%;
 }
+/** Lists Menu in Side bar */
 .module-filters .settings-sidebar,
 .module-filters .sidebar-container {
   padding: 0 12px;
@@ -987,6 +1024,7 @@ input[type="password"].inputElement {
 .lists-menu-container hr {
   margin: 5px 0;
 }
+/* mScrollbar customization for lists widget */
 .lists-menu-container .menu-scroller .mCSB_scrollTools {
   width: 13px;
 }
@@ -998,8 +1036,10 @@ input[type="password"].inputElement {
 .modules-menu .mCSB_scrollTools .mCSB_draggerContainer {
   left: 8px;
 }
+/* Customization ends */
 .lists-menu-container .list-menu-content .more-less-link {
   color: #fff;
+  /*text-decoration: none;*/
 }
 .lists-menu-container .list-menu-content .sub-header {
   color: #ddd;
@@ -1104,9 +1144,11 @@ input[type="password"].inputElement {
 .common-links-container > div a {
   color: #fff;
 }
+/*Search Container styles */
 .search-container {
   min-height: 300px;
   position: absolute;
+  /*z-index: 1030;*/
   width: 100%;
   top: 0;
   background: #FBFBFB;
@@ -1125,6 +1167,7 @@ input[type="password"].inputElement {
 .footer p {
   margin: 5px 0;
 }
+/*** Utilities ***/
 .showElement {
   display: block !important;
   height: 100%;
@@ -1247,11 +1290,11 @@ ul.unstyled {
 }
 .emptyRecordsDiv .emptyRecordsContent {
   display: inline-block;
-  font-size: 16px;
   left: 50%;
   margin-left: -25%;
   position: absolute;
   width: 50%;
+  font-size: 16px;
 }
 .textOverflowEllipsis {
   overflow: hidden;
@@ -1276,6 +1319,9 @@ ul.unstyled {
 .removeNoFileChosen {
   color: transparent !important;
 }
+/***********************************
+**********Button Styles**********
+***********************************/
 .module-buttons-container {
   float: right;
   margin-right: 10px;
@@ -1297,6 +1343,7 @@ ul.unstyled {
   margin: 4px 2px;
   border-radius: 2px;
   border: 1px solid #ddd;
+  text-transform: uppercase;
   color: #666;
   background: #fff;
 }
@@ -1317,6 +1364,9 @@ ul.unstyled {
   color: #FFFFFF !important;
   background: #5bc0de !important;
 }
+/***********************************
+**********List View Styles**********
+***********************************/
 .fa.pull-left {
   margin-right: 0;
 }
@@ -1351,7 +1401,7 @@ ul.unstyled {
   font-size: 20px;
 }
 .listview-pagination .disabled {
-  color: rgba(0,0,0,0.2);
+  color: rgba(0, 0, 0, 0.2);
 }
 .listview-pagination .disabled:hover {
   cursor: default;
@@ -1379,6 +1429,8 @@ ul.unstyled {
 .listview-table {
   margin-bottom: 0;
   border-top: 0;
+  /* Horizontal scroll will not work if table layout Fixed */
+  /*    table-layout: fixed;*/
 }
 .listview-table tr td,
 .listview-table tr th {
@@ -1408,7 +1460,7 @@ ul.unstyled {
   width: 100%;
 }
 .listViewEntries .relatedListEntryValues .fieldValue .value,
-.listViewEntries  .listViewEntryValue .fieldValue .value {
+.listViewEntries .listViewEntryValue .fieldValue .value {
   vertical-align: middle;
   width: 100%;
   display: inline-block;
@@ -1423,7 +1475,7 @@ ul.unstyled {
 }
 .listview-table-norecords .table-actions,
 .listview-table .table-actions {
-  width: 120px;
+  width: 110px;
   font-size: 15px;
   color: #555;
   margin-left: 7px;
@@ -1489,13 +1541,13 @@ input[type=checkbox]:checked {
   vertical-align: middle;
   display: table-cell;
 }
-.listview-table  tr.searchRow th {
+.listview-table tr.searchRow th {
   padding: 5px 3px;
 }
-.listview-table  tr.searchRow th.inline-search-btn {
+.listview-table tr.searchRow th.inline-search-btn {
   padding: 3px 10px;
 }
-.listview-table  tr.searchRow th.inline-search-btn button {
+.listview-table tr.searchRow th.inline-search-btn button {
   text-align: center;
   width: 85%;
   text-shadow: none;
@@ -1523,6 +1575,18 @@ input[type=checkbox]:checked {
   background-color: #FFEEEE !important;
   background-image: none !important;
 }
+/*.floatThead-wrapper .table-container{
+    z-index: 0 !important;
+}*/
+/* List view bottom fixed scroll */
+/*.bottom-fixed-scroll{
+    height: 14px;
+    position: relative;
+    top: -15px;
+    overflow-x: auto;
+    overflow-y: hidden;
+    width: 100%;
+}*/
 .scroller-div {
   height: 1px;
 }
@@ -1644,12 +1708,12 @@ input[type=checkbox]:checked {
 #listColumnFilterContainer .disabled i {
   color: #ccc;
 }
+/**********************************
+**********Detail View Styles**********
+**********************************/
 .detailViewButtoncontainer {
   padding-top: 5px;
 }
-.detailViewButtoncontainer button.btn {
-  margin: 0px 1px !important;
-}
 .detailview-header .recordBasicInfo > .info-row {
   margin-bottom: 4px;
 }
@@ -1730,9 +1794,6 @@ th {
   margin-top: 3%;
   margin-right: 2%;
 }
-.overlayDetailHeader button.btn {
-  margin: 0px 1px !important;
-}
 .referencefield-wrapper .createReferenceRecord {
   float: left;
   margin-left: 5px;
@@ -1972,10 +2033,10 @@ th {
   z-index: 1030;
 }
 .overlay-container-60 {
-  margin-left: 42px;
+  margin-left: 42px ;
 }
 .overlay-container-300 {
-  margin-left: 230px;
+  margin-left: 230px ;
 }
 .overlayPageContent {
   background: #FFFFFF;
@@ -2098,6 +2159,9 @@ th {
   height: 26px;
   line-height: 25px;
 }
+/**********************************
+**********Summary View Styles******
+**********************************/
 .summary-table {
   width: 100%;
   table-layout: fixed;
@@ -2218,33 +2282,33 @@ th {
   opacity: 1;
   cursor: pointer;
 }
-.details.row >form .social-media-toggle {
+.details.row > form .social-media-toggle {
   position: absolute;
   right: -15px;
   display: inline-block;
   width: 500px;
   border-left: 0px;
 }
-.details.row >form .social-media-widget {
+.details.row > form .social-media-widget {
   border-left: 1px solid #ddd;
   border-bottom: 1px solid #ddd;
   height: 100%;
   background: white;
 }
-.details.row >form div[class*="col-"].resizable-summary-view {
+.details.row > form div[class*="col-"].resizable-summary-view {
   padding-left: 0;
   padding-right: 0px;
 }
-.details.row >form>div[class*="col-"],
-.details.row >form .resizable-summary-view div[class*="col-"] {
+.details.row > form > div[class*="col-"],
+.details.row > form .resizable-summary-view div[class*="col-"] {
   padding-right: 0;
   padding: 0px 5px;
 }
-.details.row >form>div[class*="col-"]:first-child,
-.details.row >form .left-block {
+.details.row > form > div[class*="col-"]:first-child,
+.details.row > form .left-block {
   padding-left: 0 !important;
 }
-.details.row >form>div[class*="col-"]:last-child {
+.details.row > form > div[class*="col-"]:last-child {
   padding-right: 0;
 }
 .summaryWidgetContainer .noContent {
@@ -2257,6 +2321,9 @@ th {
 .caseReplyArea .nav > li {
   padding: 0 10px;
 }
+/**********************************
+**********Edit View Styles*******
+**********************************/
 .main-container .editViewModNavigator.module-nav,
 .editViewModNavigator .mod-switcher-container,
 .editViewModNavigator .modules-menu {
@@ -2297,7 +2364,7 @@ th {
   width: 100%;
 }
 .editViewContents .input-group {
-  width: 229px;
+  width: 208px;
   float: left;
 }
 .input-group.inputElement .input-group-addon {
@@ -2376,6 +2443,9 @@ th {
   z-index: 1000;
   padding: 7px;
 }
+/**********************************
+**********Advance Search styles**********
+**********************************/
 .op0.fadeInx {
   opacity: 1;
 }
@@ -2448,7 +2518,11 @@ th {
 }
 .btn + input {
   margin-left: 5px;
+  /*    margin-top : 3px;*/
 }
+/**********************************
+**********Extension Store Styles**********
+**********************************/
 .extensionstore .app-trigger {
   width: 98%;
 }
@@ -2479,6 +2553,9 @@ th {
 .extensionContents .extensionError {
   color: #F10404;
 }
+/**********************************
+**********Extension Store Nav Bar**********
+**********************************/
 .tabbable-line > .nav-tabs {
   border: none;
   margin: 0px;
@@ -2547,6 +2624,9 @@ th {
 .extensionContents .listview-table {
   width: 100%;
 }
+/*******************************************
+******Detail View related list styles*******
+********************************************/
 .relatedContents .listViewContentHeaderValues:hover {
   text-decoration: none;
   color: #333;
@@ -2604,6 +2684,9 @@ th {
 .relatedViewActions .btn-group {
   margin-right: 15px;
 }
+/*******************************************
+****************** Modal *******************
+********************************************/
 .modal-header {
   padding: 5px 15px;
   background: #596875;
@@ -2631,6 +2714,7 @@ th {
   width: 100%;
   float: left;
   background: #596875;
+  /*    height: 100%;*/
 }
 .settings-menu {
   display: inline-block;
@@ -2647,7 +2731,7 @@ th {
   cursor: n-resize;
 }
 .settings-menu-items {
-  box-shadow: 0 1px 1px rgba(0,0,0,0.05);
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
   margin-bottom: 10px;
   text-align: justify;
 }
@@ -2765,9 +2849,6 @@ th {
 .active .stepNum {
   color: #FFFFFF;
 }
-.mailBoxEditDiv .crumbs li {
-  width: 22%;
-}
 .stepNum {
   display: inline-block;
   padding: 0 5px;
@@ -2776,6 +2857,7 @@ th {
   vertical-align: middle;
   color: #3399ff;
 }
+/* .squaredFour */
 .squaredFour {
   width: 20px;
   position: relative;
@@ -2789,9 +2871,9 @@ th {
   top: 0;
   left: 0;
   background: #fcfff4;
-  background: linear-gradient(top,#fcfff4 0%,#dfe5d7 40%,#b3bead 100%);
+  background: linear-gradient(top, #fcfff4 0%, #dfe5d7 40%, #b3bead 100%);
   border-radius: 4px;
-  box-shadow: inset 0px 1px 1px white, 0px 1px 3px rgba(0,0,0,0.5);
+  box-shadow: inset 0px 1px 1px white, 0px 1px 3px rgba(0, 0, 0, 0.5);
 }
 .squaredFour label:after {
   content: '';
@@ -2819,13 +2901,16 @@ th {
 .importBlockContainer {
   color: #596875;
 }
+/******************************************* 
+************* Social Buttons *************** 
+********************************************/
 .btn-block + .btn-block {
   margin-top: 5px;
 }
 .btn-google-plus {
   color: #FFFFFF !important;
   background-color: #DD4B39;
-  border-color: rgba(0,0,0,0.2);
+  border-color: rgba(0, 0, 0, 0.2);
 }
 .btn-social {
   position: relative;
@@ -2844,15 +2929,18 @@ th {
   line-height: 34px;
   font-size: 1.6em;
   text-align: center;
-  border-right: 1px solid rgba(0,0,0,0.2);
+  border-right: 1px solid rgba(0, 0, 0, 0.2);
 }
+/******************************************* 
+************* Updates Timeline *************** 
+********************************************/
 .recentActivitiesContainer .history {
   margin: 0 auto;
   padding: 20px 20px 1px;
   max-width: 100%;
   overflow-x: visible;
-  -webkit-transition: opacity .2s ease-out;
-  transition: opacity .2s ease-out;
+  -webkit-transition: opacity 0.2s ease-out;
+  transition: opacity 0.2s ease-out;
 }
 .updates_timeline {
   padding-top: 20px;
@@ -2861,6 +2949,7 @@ th {
   padding: 0;
   list-style: none;
 }
+/* The line */
 .updates_timeline:before {
   content: '';
   position: absolute;
@@ -2879,6 +2968,7 @@ th {
   min-height: 40px;
   z-index: 2;
 }
+/* Left Content(Time) */
 .updates_timeline > li .update_time {
   position: absolute;
   margin: 0;
@@ -2890,6 +2980,7 @@ th {
   font-size: 15px;
   font-style: italic;
 }
+/* Right content(Update info) */
 .updates_timeline > li .update_info {
   padding: 10px 10px 1px;
   display: block;
@@ -2898,10 +2989,11 @@ th {
   position: relative;
   top: -45px;
 }
-.updates_timeline > li .update_info >h3 {
+.updates_timeline > li .update_info > h3 {
   font-size: 1.1em;
   margin-left: -3%;
 }
+/* The icons  */
 .updates_timeline > li .update_icon {
   position: relative;
   border-radius: 50%;
@@ -2914,6 +3006,7 @@ th {
   color: #fff;
   line-height: 35px;
 }
+/* More Button */
 .updates_timeline #more_button .update_icon {
   position: relative;
   border-radius: 0;
@@ -3021,6 +3114,9 @@ th {
   vertical-align: super;
   font-size: 13px;
 }
+/******************************************* 
+************* Task Management ************** 
+********************************************/
 #taskManagementContainer .data-body {
   margin-bottom: 50px;
 }
@@ -3083,15 +3179,16 @@ th {
 #taskManagementContainer .other-details {
   color: #979797;
 }
+/*overwriting jquery ui css*/
 .ui-menu {
   z-index: 10000;
 }
 #taskManagementContainer button.active {
   background: #3B83F7;
   color: white;
-  text-shadow: 0 1px rgba(0,0,0,0.3);
+  text-shadow: 0 1px rgba(0, 0, 0, 0.3);
   border: 1px solid #135fd7;
-  box-shadow: inset 0 1px 2px rgba(0,0,0,0.3);
+  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.3);
 }
 .taskSubject {
   width: 99%;
@@ -3099,6 +3196,9 @@ th {
 #taskManagementContainer .mCustomScrollbar .mCSB_inside > .mCSB_container {
   margin-right: 13px;
 }
+/******************************************* 
+************* Settings Page ************** 
+********************************************/
 .settingsPageDiv.content-area {
   margin-right: 0;
 }
@@ -3132,6 +3232,9 @@ th {
 .settingsgroup-accordion a i {
   margin-right: 5px;
 }
+.settingsgroup-accordion a span {
+  text-transform: uppercase;
+}
 .settingsgroup {
   background: #2C3B49;
   height: 100%;
@@ -3288,35 +3391,59 @@ th {
 }
 .mini-slider-control[data-value="0"] .ui-slider-handle {
   background: #7d7e7d;
-  background: -moz-linear-gradient(top,#7d7e7d 0%,#0e0e0e 100%);
-  background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#7d7e7d),color-stop(100%,#0e0e0e));
-  background: -webkit-linear-gradient(top,#7d7e7d 0%,#0e0e0e 100%);
-  background: -o-linear-gradient(top,#7d7e7d 0%,#0e0e0e 100%);
-  background: -ms-linear-gradient(top,#7d7e7d 0%,#0e0e0e 100%);
-  background: linear-gradient(to bottom,#7d7e7d 0%,#0e0e0e 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#7d7e7d',endColorstr='#0e0e0e',GradientType=0);
+  /* Old browsers */
+  background: -moz-linear-gradient(top, #7d7e7d 0%, #0e0e0e 100%);
+  /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #7d7e7d), color-stop(100%, #0e0e0e));
+  /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #7d7e7d 0%, #0e0e0e 100%);
+  /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top, #7d7e7d 0%, #0e0e0e 100%);
+  /* Opera 11.10+ */
+  background: -ms-linear-gradient(top, #7d7e7d 0%, #0e0e0e 100%);
+  /* IE10+ */
+  background: linear-gradient(to bottom, #7d7e7d 0%, #0e0e0e 100%);
+  /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#7d7e7d', endColorstr='#0e0e0e', GradientType=0);
+  /* IE6-9 */
   margin-left: 0px;
 }
 .mini-slider-control[data-value="1"] .ui-slider-handle {
   background: #ffb76b;
-  background: -moz-linear-gradient(top,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#ffb76b),color-stop(0%,#ffa73d),color-stop(49%,#ff7c00),color-stop(100%,#ff7f04));
-  background: -webkit-linear-gradient(top,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  background: -o-linear-gradient(top,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  background: -ms-linear-gradient(top,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  background: linear-gradient(to bottom,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffb76b',endColorstr='#ff7f04',GradientType=0);
+  /* Old browsers */
+  background: -moz-linear-gradient(top, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffb76b), color-stop(0%, #ffa73d), color-stop(49%, #ff7c00), color-stop(100%, #ff7f04));
+  /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* Opera 11.10+ */
+  background: -ms-linear-gradient(top, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* IE10+ */
+  background: linear-gradient(to bottom, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffb76b', endColorstr='#ff7f04', GradientType=0);
+  /* IE6-9 */
   margin-left: -6px;
 }
 .mini-slider-control[data-value="2"] .ui-slider-handle {
   background: #bfd255;
-  background: -moz-linear-gradient(top,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#bfd255),color-stop(79%,#8eb92a),color-stop(100%,#72aa00),color-stop(100%,#9ecb2d));
-  background: -webkit-linear-gradient(top,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  background: -o-linear-gradient(top,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  background: -ms-linear-gradient(top,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  background: linear-gradient(to bottom,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bfd255',endColorstr='#9ecb2d',GradientType=0);
+  /* Old browsers */
+  background: -moz-linear-gradient(top, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #bfd255), color-stop(79%, #8eb92a), color-stop(100%, #72aa00), color-stop(100%, #9ecb2d));
+  /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* Opera 11.10+ */
+  background: -ms-linear-gradient(top, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* IE10+ */
+  background: linear-gradient(to bottom, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bfd255', endColorstr='#9ecb2d', GradientType=0);
+  /* IE6-9 */
   margin-left: -13px;
 }
 .ModulemanagerSettings .moduleblock .hiden {
@@ -3341,10 +3468,13 @@ th {
 th {
   padding: 6px;
 }
+/******************************************* 
+********** CustomerPortal styles start ********
+********************************************/
 .cp-tabs .enabledModules {
   display: inline-block ! important;
-  margin-left: 4px !important;
-  margin-right: 4px !important;
+  margin-left: 4px!important;
+  margin-right: 4px!important;
   vertical-align: top;
 }
 .drag-portal-module {
@@ -3451,7 +3581,7 @@ th {
   margin-left: 5px;
 }
 .portal-field-delete {
-  margin-left: 45px !important;
+  margin-left: 45px!important;
 }
 .portalModuleRow {
   border-left: 4px solid #EF5E29 !important;
@@ -3468,7 +3598,7 @@ th {
   content: "*";
   color: red;
 }
-.nav-tabs .cp-modules > .active >a,
+.nav-tabs .cp-modules > .active > a,
 .nav-tabs .cp-modules > .active > a:hover {
   border: 0px !important;
   border-top-right-radius: 0px;
@@ -3630,7 +3760,7 @@ th {
   display: inline-block;
 }
 .quickPreview .updates_timeline:before {
-  background: #e6e6e6;
+  background: #e5e5e5;
   width: 2px;
   margin-left: -1%;
 }
@@ -3645,13 +3775,16 @@ th {
 .quickPreviewComments .recentComments .commentDetails .comment {
   line-height: 15px;
 }
-.quickPreviewComments  .summaryWidgetContainer {
+.quickPreviewComments .summaryWidgetContainer {
   border: 0;
   padding: 0;
 }
 .quickPreview .recentActivitiesContainer .history {
   padding: 0;
 }
+/******************************************* 
+********** Calendar view styles ************
+********************************************/
 .calendar-sidebar {
   width: 100% !important;
 }
@@ -3808,6 +3941,11 @@ th {
   display: inline-block;
   text-align: center;
 }
+/******************************************* 
+********** Calendar view styles end ********
+
+********** Documents Module styles *********
+********************************************/
 .dragdrop-dotted {
   border: 2px dashed #C0C0C0;
   min-width: 300px;
@@ -3867,13 +4005,16 @@ tr.file > td.fileOwnerData {
   width: 100px;
   white-space: pre-wrap;
 }
+/******************************************* 
+********** Documents Module styles end *****
+********************************************/
 .engagementsContainer .engagements_content {
   padding-top: 15px;
 }
 .summaryWidgetContainer .engagementsContainer table {
   width: inherit;
 }
-.engagements_content table thead>tr:first-child {
+.engagements_content table thead > tr:first-child {
   border: 1px solid #CCC;
   background-color: #F5F5F5;
 }
@@ -3924,6 +4065,9 @@ tr.file > td.fileOwnerData {
   font-size: 15px;
   padding: 1% 0;
 }
+/******************************************* 
+********** Mailroom view styles start ********
+********************************************/
 .mailroomBanner {
   margin: 23px 0;
   height: 215px;
@@ -4132,6 +4276,7 @@ tr.file > td.fileOwnerData {
   margin-left: 0;
 }
 .mentionMessages .mention_follow_up {
+  /*//load this color from variable.less*/
   background-color: green;
 }
 .modelContainer .modal-content {
@@ -4280,6 +4425,7 @@ form[name="notification_settings"] .select2-choice {
   margin-left: 0;
 }
 .mentionMessages .mention_follow_up {
+  /*//load this color from variable.less*/
   background-color: green;
 }
 .modal-content .mention_followup .row {
@@ -4311,6 +4457,9 @@ form[name="notification_settings"] .select2-choice {
 .mentionMessageHeader .MultiFile-remove {
   color: #FFFFFF;
 }
+/******************************************* 
+********** Mailroom view styles end ********
+********************************************/
 .detailview-header {
   margin-bottom: 10px;
 }
@@ -4326,6 +4475,7 @@ form[name="notification_settings"] .select2-choice {
   margin: 0px 10px;
   text-decoration: underline !important;
   color: #3498DB;
+  /*font-size : 12px;*/
 }
 .tag {
   display: inline-block;
@@ -4409,11 +4559,10 @@ form[name="notification_settings"] .select2-choice {
   border: 1px solid #dcdcdc;
 }
 #tagCloud .tag {
-  color: #5ea9dd;
-  padding: 0px;
   background-color: #FFFFFF;
   border-color: #FFFFFF;
   border-radius: 0px;
+  color: #5ea9dd;
   margin: 3px;
 }
 #tagCloud .tag[data-type="public"] {
@@ -4424,6 +4573,9 @@ form[name="notification_settings"] .select2-choice {
   max-width: 80px;
   vertical-align: bottom;
 }
+/******************************************* 
+********** Groups view styles ********
+********************************************/
 #s2id_memberList li > div,
 .groupMembersColors li > div {
   margin-left: 10px;
@@ -4498,6 +4650,12 @@ form[name="notification_settings"] .select2-choice {
   margin: 0px;
   color: #444444;
 }
+/******************************************* 
+********** Groups view styles  ends********
+********************************************/
+/******************************************* 
+********** Picklist Css ********
+********************************************/
 .pickListValue {
   background-color: #FFFFFF;
 }
@@ -4512,6 +4670,12 @@ form[name="notification_settings"] .select2-choice {
   padding: 2px 1px !important;
   line-height: 15px;
 }
+/******************************************* 
+************* Dashboard Styles *************
+********************************************/
+li.dashboardWidget {
+  overflow: auto;
+}
 .dashboardWidgetHeader .title {
   padding-bottom: 10px;
   font-size: 15px;
@@ -4532,9 +4696,6 @@ form[name="notification_settings"] .select2-choice {
 .dashBoardContainer .tabContainer .tab-content {
   margin-top: 10px;
 }
-.dashBoardContainer .dashBoardTabContents ul {
-  margin: 0;
-}
 .dashBoardContainer .dashBoardTabContents ul li {
   border: 3px solid #E2E2E4;
   box-shadow: 1px;
@@ -4601,7 +4762,7 @@ form[name="notification_settings"] .select2-choice {
   display: inline-block;
   opacity: 1;
 }
-.dashBoardContainer .tabContainer li a  .deleteTab:hover {
+.dashBoardContainer .tabContainer li a .deleteTab:hover {
   cursor: pointer;
 }
 #minilistWizardContainer .fieldLabel {
@@ -4638,6 +4799,9 @@ form[name="notification_settings"] .select2-choice {
   resize: none;
   width: 100%;
 }
+/******************************************* 
+********** Picklist DependencyGraph ********
+********************************************/
 #dependencyGraph .tableHeading {
   text-align: center;
   padding-top: 30px;
@@ -4663,12 +4827,15 @@ form[name="notification_settings"] .select2-choice {
 #dependencyGraph .dependencyMapping .pickListDependencyTable .selectedCell {
   background: #a9cbf5;
 }
+/******************************************* 
+********** Rewriting select2 for consistency********
+********************************************/
 .select2-container .select2-choice {
   height: 29px;
   border-radius: 1px;
 }
 .modal {
-  z-index: 1100;
+  z-index: 1070;
 }
 .select2-container .select2-choice {
   height: 28px;
@@ -4756,6 +4923,7 @@ hr {
   position: fixed;
   bottom: 0;
   background: #EFEFEF;
+  /*width:100%;*/
   border-left: 42px solid #2c3b49;
   height: 60px;
   left: 0;
@@ -4774,7 +4942,6 @@ hr {
 }
 .settingsPageDiv .modal-overlay-footer {
   margin-left: 230px;
-  border-left: 0px solid;
 }
 .settingsOverlayContainer .modal-overlay-footer {
   margin: 0;
@@ -4797,14 +4964,14 @@ hr {
   vertical-align: middle;
   margin-top: 6px;
 }
-.list-menu-content .pull-right>.dropdown-menu {
+.list-menu-content .pull-right > .dropdown-menu {
   left: -126px;
   position: relative;
 }
-.dropdown-menu>li>a {
+.dropdown-menu > li > a {
   padding: 4px 6px;
 }
-.dropdown-menu>li>a span i {
+.dropdown-menu > li > a span i {
   font-size: 15px;
   vertical-align: middle;
 }
@@ -4812,11 +4979,11 @@ hr {
   max-height: 300px;
   padding-left: 0;
 }
-.related-tabs .dropdown-menu>.mCustomScrollBox>.mCSB_container {
+.related-tabs .dropdown-menu > .mCustomScrollBox > .mCSB_container {
   margin-right: 0;
   padding: 4px 6px;
 }
-.related-tabs .dropdown-menu>.mCustomScrollBox>.mCSB_container>li>a {
+.related-tabs .dropdown-menu > .mCustomScrollBox > .mCSB_container > li > a {
   display: block;
   padding: 3px 5px;
   clear: both;
@@ -4825,7 +4992,7 @@ hr {
   color: #333;
   white-space: nowrap;
 }
-.related-tabs .dropdown-menu>.mCustomScrollBox>.mCSB_container span i {
+.related-tabs .dropdown-menu > .mCustomScrollBox > .mCSB_container span i {
   font-size: 15px;
   vertical-align: middle;
 }
@@ -4848,16 +5015,16 @@ hr {
 .calendar-sidebar .calendar-sidebar-tabs.padding {
   padding-left: 20px !important;
 }
-.related-tabs.row .nav>li {
+.related-tabs.row .nav > li {
   padding: 0 10px;
   margin: 0 2px;
 }
-.massEditTabs.nav>li {
+.massEditTabs.nav > li {
   padding: 0 10px;
   margin: 0 4px;
 }
-.row .nav>li>a,
-.row .nav>li>a:hover {
+.row .nav > li > a,
+.row .nav > li > a:hover {
   padding: 10px 3px;
   border: none;
   vertical-align: bottom;
@@ -4867,38 +5034,39 @@ hr {
   -webkit-box-sizing: border-box;
   -o-box-sizing: border-box;
 }
-.row .nav>li>a:hover {
+.row .nav > li > a:hover {
   border-bottom-color: #555;
 }
-TN-34230
-
-.row .nav>li>a:hover {
+/*.row ul{
+    padding:0;
+}*/
+TN-34230 .row .nav > li > a:hover {
   border-bottom-color: #555;
   background: none;
 }
 .row ul li:first-child {
   margin-left: 0;
 }
-.related-tabs .nav-tabs>li.active,
-.related-tabs .nav-tabs>li:hover,
-.related-tabs .nav-tabs>li.active:focus,
-.dashBoardContainer .nav-tabs>li.active,
-.dashBoardContainer .nav-tabs>li:hover,
-.dashBoardContainer .nav-tabs>li.active:focus,
-.contents.tabbable .nav-tabs>li.active,
-.contents.tabbable .nav-tabs>li:hover,
-.contents.tabbable .nav-tabs>li.active:focus {
+.related-tabs .nav-tabs > li.active,
+.dashBoardContainer .nav-tabs > li.active,
+.contents.tabbable .nav-tabs > li.active,
+.related-tabs .nav-tabs > li:hover,
+.dashBoardContainer .nav-tabs > li:hover,
+.contents.tabbable .nav-tabs > li:hover,
+.related-tabs .nav-tabs > li.active:focus,
+.dashBoardContainer .nav-tabs > li.active:focus,
+.contents.tabbable .nav-tabs > li.active:focus {
   border: none;
   border-bottom: 3px solid #555;
 }
-.nav-tabs>li.active>a,
-.nav-tabs>li.active>a:hover,
-.nav-tabs>li.active>a:focus,
-.nav-tabs>li>a {
+.nav-tabs > li.active > a,
+.nav-tabs > li.active > a:hover,
+.nav-tabs > li.active > a:focus,
+.nav-tabs > li > a {
   border: 0;
 }
-.nav>li>a:hover,
-.nav>li>a:focus {
+.nav > li > a:hover,
+.nav > li > a:focus {
   background-color: #FFFFFF;
 }
 .fa-pencil,
@@ -4908,6 +5076,9 @@ TN-34230
 .commentAttachmentName {
   font-size: 11px;
 }
+/******************************************* 
+********** Layout Editor ********
+********************************************/
 .marginBottom10px {
   margin-bottom: 10px;
 }
@@ -4930,6 +5101,7 @@ TN-34230
 }
 .zeroOpacity {
   opacity: 0;
+  /*for IE*/
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
   filter: alpha(opacity=0);
 }
@@ -4956,10 +5128,12 @@ TN-34230
 .layoutContent .opacity:hover .actions {
   opacity: 1;
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
+  /*for IE*/
   filter: alpha(opacity=100);
 }
 .layoutContent .fieldPropertyContainer:hover .actions {
   opacity: 1;
+  /*for IE*/
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
   filter: alpha(opacity=100);
 }
@@ -4982,6 +5156,7 @@ TN-34230
 .relatedTabModulesList .addButton {
   border-radius: 2px;
   border: 1px solid #DDDDDD;
+  text-transform: uppercase;
   color: #666666;
   background: #FFFFFF;
 }
@@ -5055,6 +5230,9 @@ TN-34230
   margin-left: 5px;
   word-break: break-all;
 }
+/******************************************* 
+************** Tax Management **************
+********************************************/
 #TaxCalculationsContainer .table tr:first-child,
 .taxModalContainer #editTax .table tr:first-child {
   border-bottom: 1px solid #ccc;
@@ -5094,6 +5272,9 @@ TN-34230
   max-height: 500px;
   overflow-y: auto;
 }
+/******************************************* 
+********** Workflows ********
+********************************************/
 #workflow_edit .editViewBody {
   overflow: inherit;
 }
@@ -5103,7 +5284,7 @@ TN-34230
 }
 .timePicker {
   width: 9.5em !important;
-  z-index: 1101 !important;
+  z-index: 1070 !important;
 }
 .weekDaySelect .ui-state-default {
   background: inherit;
@@ -5141,75 +5322,6 @@ TN-34230
 .module-filters.active {
   background: #F7F7F7;
 }
-.payment-type-selection {
-  margin-bottom: 30px;
-}
-.payment-type-selection img {
-  vertical-align: middle;
-}
-.currplan {
-  padding: 10px 20px;
-  background-color: #f3f3f3;
-  border: 1px solid #eee;
-  border-radius: 3px;
-}
-.currplan div {
-  display: inline-block;
-  font-size: 16px;
-}
-.planName {
-  display: inline-block;
-  color: #fff;
-  padding: 20px;
-  margin: 10px 20px;
-  font-size: 24px;
-  border-radius: 2px;
-}
-.plan-heading {
-  min-height: 168px;
-}
-.plan-title {
-  color: #fff;
-  font-size: 20px;
-  padding: 13px 0;
-}
-#sales_plan {
-  background: #3FC380;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#salespremium_plan {
-  background: #00B16A;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#support_plan {
-  background: #2980B9;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#supportpremium_plan {
-  background: #2980B9;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#ultimate_plan,
-#exclusive_plan {
-  background: #F39C12;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#contact_plan {
-  background: #FF5959;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
 .workflowListContainer .select2-container .select2-choice {
   height: 36px;
 }
@@ -5224,6 +5336,7 @@ TN-34230
 .contactAdd {
   border: 1px solid #eee;
   padding: 20px;
+  /*min-height: 310px !important;*/
 }
 #subDetails table td {
   padding: 7px 10px;
@@ -5346,9 +5459,9 @@ TN-34230
 .productBundles {
   padding-left: 20px;
 }
-.nav .open>a,
-.nav .open>a:hover,
-.nav .open>a:focus {
+.nav .open > a,
+.nav .open > a:hover,
+.nav .open > a:focus {
   color: #000000;
   background-color: #FFFFFF;
 }
@@ -5369,6 +5482,9 @@ TN-34230
   width: 100%;
   overflow-x: auto;
 }
+/******************************************* 
+*************** Mail Manager ***************
+********************************************/
 #mm_searchButton {
   height: 28px;
   background-color: #FFFFFF;
@@ -5424,8 +5540,8 @@ TN-34230
   padding: 1px 5px;
   border-radius: 3px;
   text-align: center;
-  text-shadow: 0 1px rgba(0,0,0,0.1);
-  background-image: -webkit-linear-gradient(top,#DD4B39 0,#D14836 100%);
+  text-shadow: 0 1px rgba(0, 0, 0, 0.1);
+  background-image: -webkit-linear-gradient(top, #DD4B39 0, #D14836 100%);
   border: 1px solid #C6322A;
   background-color: #DD4B39;
 }
@@ -5643,6 +5759,7 @@ TN-34230
 .width40per {
   width: 40%;
 }
+/****** Mail Manager Ends ******/
 .quickCreateContent .massEditTable textarea,
 .addCommentBlock .commentTextArea textarea {
   resize: vertical;
@@ -5655,19 +5772,20 @@ TN-34230
 .select2-container-multi .select2-choices {
   z-index: 1;
 }
-.nav .nav-stacks .cp-nav-header-wrapper>li.disabled>a:hover {
+/****** Customer Portal Settings ******/
+.nav .nav-stacks .cp-nav-header-wrapper > li.disabled > a:hover {
   background-color: #fff;
 }
-.cp-nav-header-wrapper>li.disabled>a:hover {
+.cp-nav-header-wrapper > li.disabled > a:hover {
   border: 0px ! important;
 }
-.nav .nav-stacks .cp-nav-header-wrapper>li.disabled>a {
+.nav .nav-stacks .cp-nav-header-wrapper > li.disabled > a {
   background-color: #fff;
 }
-#portalModulesTable>li.portalModuleRow.active>a:hover {
+#portalModulesTable > li.portalModuleRow.active > a:hover {
   background-color: #fff !important;
 }
-#portalModulesTable>li.portalModuleRow.active>a:focus {
+#portalModulesTable > li.portalModuleRow.active > a:focus {
   background-color: #fff !important;
 }
 .portal-dashboard {
@@ -5766,7 +5884,7 @@ TN-34230
 .portal-dashboard {
   border-bottom: 0px ! important;
 }
-#portal-shortcutsContainer>ul {
+#portal-shortcutsContainer > ul {
   border-bottom: 0px ! important;
 }
 .portalMenuHeader {
@@ -5775,14 +5893,15 @@ TN-34230
 }
 .cp-tabs .enabledModules {
   display: inline-block ! important;
-  margin-left: 4px !important;
-  margin-right: 4px !important;
+  margin-left: 4px!important;
+  margin-right: 4px!important;
   vertical-align: top;
   margin-top: 4px !important;
 }
 .portal-shortcut-list:hover {
   border-bottom: 3px solid transparent ! important;
 }
+/****** Customer Portal Settings ******/
 .label-radio label input[type="radio"] {
   position: relative;
   top: 2px;
@@ -5794,6 +5913,9 @@ TN-34230
 div.tooltip-inner {
   max-width: 400px;
 }
+/******************************************* 
+********** Menu Editor ********
+********************************************/
 .sortable.appContainer.ui-sortable {
   width: 160px;
 }
@@ -5968,7 +6090,7 @@ div.tooltip-inner {
   width: 13px !important;
   margin-top: 8px;
 }
-.detailview-table .input-group-addon+.inputElement.form-control,
+.detailview-table .input-group-addon + .inputElement.form-control,
 .detailview-table .inputElement.form-control.input-medium {
   width: 100%;
 }
@@ -6015,6 +6137,7 @@ div.tooltip-inner {
   float: left;
   margin-right: 5px;
 }
+/***** Oursites Changes *****/
 .portal-table .table-actions {
   width: inherit ! important;
 }
@@ -6026,6 +6149,7 @@ div.tooltip-inner {
   padding: 10px 5px ! important;
   padding-left: 10px ! important;
 }
+/***** Oursites Changes *****/
 .ExtensionscontentsDiv .content-area {
   padding-left: 15px;
   padding-right: 15px;
@@ -6039,14 +6163,14 @@ div.tooltip-inner {
 }
 .blockHeader {
   border-color: #F3F3F4 #F3F3F4 #cbcbcf;
-  border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
   background-color: #474747;
-  background-image: -moz-linear-gradient(top,#555555,#333333);
-  background-image: -ms-linear-gradient(top,#555555,#333333);
-  background-image: -webkit-gradient(linear,0 0,0 100%,from(#555555),to(#333333));
-  background-image: -webkit-linear-gradient(top,#555555,#333333);
-  background-image: -o-linear-gradient(top,#555555,#333333);
-  background-image: linear-gradient(top,#555555,#333333);
+  background-image: -moz-linear-gradient(top, #555555, #333333);
+  background-image: -ms-linear-gradient(top, #555555, #333333);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#333333));
+  background-image: -webkit-linear-gradient(top, #555555, #333333);
+  background-image: -o-linear-gradient(top, #555555, #333333);
+  background-image: linear-gradient(top, #555555, #333333);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#333333', GradientType=0);
   min-height: 30px;
@@ -6139,8 +6263,8 @@ div.tooltip-inner {
 .markStar .starredStatus {
   display: none;
 }
-.nav>li.addDashboardTab>a,
-.nav>li.addDashboardTab>a:hover {
+.nav > li.addDashboardTab > a,
+.nav > li.addDashboardTab > a:hover {
   padding: 10px 15px;
   background: inherit;
 }
@@ -6153,7 +6277,7 @@ div.tooltip-inner {
   height: 960px;
   width: 1260px;
 }
-.nav-tabs>li {
+.nav-tabs > li {
   border-bottom: 3px solid transparent;
   margin: 0 2px;
 }
@@ -6231,16 +6355,14 @@ div.tooltip-inner {
 }
 .select2-container.select2-container-multi.select2,
 .editViewPageDiv .select2-container.select2-container-multi.select2 {
-  height: auto !important;
+  height: auto!important;
 }
-.summaryViewFields .select2-container-multi.inputElement.form-control
-.quickCreateContent .select2-container.select2-container-multi.select2,
+.summaryViewFields .select2-container-multi.inputElement.form-control .quickCreateContent .select2-container.select2-container-multi.select2,
 #massEditContainer .select2-container.select2-container-multi.select2 {
   width: 150px;
   height: auto !important;
 }
-.summaryViewFields .select2-container-multi.inputElement.form-control
-.quickCreateContent .select2-container.select2-container-multi.select2 .input-save-wrap,
+.summaryViewFields .select2-container-multi.inputElement.form-control .quickCreateContent .select2-container.select2-container-multi.select2 .input-save-wrap,
 #massEditContainer .select2-container.select2-container-multi.select2 .input-save-wrap {
   float: right;
   margin-right: 25px;
@@ -6336,6 +6458,7 @@ a.cp-modules:hover {
 #RestrictionsLayout {
   background: #fafafb;
   margin-top: -92px;
+  /*to adjust with page padding top*/
 }
 #RestrictionsLayout .vtImage {
   width: 22%;
@@ -6369,6 +6492,7 @@ a.cp-modules:hover {
 .datepicker {
   z-index: 1100 !important;
 }
+/*****RSS Changes****/
 .feedListContainer .listview-table tr td:first-child,
 .listview-table tr th:first-child {
   width: inherit ! important;
@@ -6376,12 +6500,14 @@ a.cp-modules:hover {
 .feedListContainer .listViewEntries .listViewEntryValue {
   max-width: inherit ! important;
 }
-.ps-container>.ps-scrollbar-y-rail {
+/*****RSS Changes****/
+.ps-container > .ps-scrollbar-y-rail {
   z-index: 1002;
 }
 #relationBlock .recordScroll {
   max-height: 150px;
 }
+/*Start - List sidebar toggle*/
 .essentials-toggle {
   background-color: white;
   font-weight: bold;
@@ -6401,6 +6527,7 @@ a.cp-modules:hover {
 .essentials-toggle .fa-chevron-right {
   background-position: -460px -72px !important;
 }
+/*End - List essentials toggle*/
 .module-name-tooltip .qtip-content {
   font-size: 12px;
   padding: 3px;
@@ -6484,8 +6611,8 @@ li.select2-search-choice div {
 .popover ul.listmenu li {
   padding: 3px;
 }
-.popover-content .disabled>a,
-.popover .disabled>a {
+.popover-content .disabled > a,
+.popover .disabled > a {
   opacity: 0.5;
   cursor: not-allowed;
 }
@@ -6496,6 +6623,7 @@ li.select2-search-choice div {
   -o-transform: rotate(180deg);
   transform: rotate(180deg);
 }
+/*Start - List sidebar toggle*/
 .essentials-toggle {
   background-color: white;
   font-weight: bold;
@@ -6515,6 +6643,7 @@ li.select2-search-choice div {
 .essentials-toggle .fa-chevron-right {
   background-position: -460px -72px !important;
 }
+/*End - List essentials toggle*/
 .module-name-tooltip .qtip-content {
   font-size: 12px;
   padding: 3px;
@@ -6595,16 +6724,16 @@ li.select2-search-choice div {
 #reportDetails .pivot .toptitle.targetY0,
 #reportDetails .pivot .lefttitle.targetX0 {
   border-color: #F3F3F4 #F3F3F4 #cbcbcf;
-  border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
   background-color: #474747;
-  background-image: -moz-linear-gradient(top,#555555,#333333);
-  background-image: -ms-linear-gradient(top,#555555,#333333);
-  background-image: -webkit-gradient(linear,0 0,0 100%,from(#555555),to(#333333));
-  background-image: -webkit-linear-gradient(top,#555555,#333333);
-  background-image: -o-linear-gradient(top,#555555,#333333);
-  background-image: linear-gradient(top,#555555,#333333);
+  background-image: -moz-linear-gradient(top, #555555, #333333);
+  background-image: -ms-linear-gradient(top, #555555, #333333);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#333333));
+  background-image: -webkit-linear-gradient(top, #555555, #333333);
+  background-image: -o-linear-gradient(top, #555555, #333333);
+  background-image: linear-gradient(top, #555555, #333333);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555',endColorstr='#333333',GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#333333', GradientType=0);
   min-height: 30px;
 }
 #reportDetails .pivot th.toptitle.targetY0,
@@ -6646,7 +6775,8 @@ li.select2-search-choice div {
   background: #FFFFFF;
 }
 .templateActions {
-  background: rgba(0,0,0,0.1);
+  background: rgba(0, 0, 0, 0.1);
+  /*padding: 4%;*/
   bottom: 0;
   text-align: center;
   position: absolute;
@@ -6654,6 +6784,9 @@ li.select2-search-choice div {
   zoom: 1;
   width: 100%;
 }
+/*.templateActions i {
+    margin-right: 30px;
+}*/
 .thumbnails > li {
   float: left;
   height: 315px !important;
@@ -6828,9 +6961,10 @@ a.btnReport:hover {
   left: 0px;
 }
 .bx-wrapper .bx-viewport {
-  width:99%;
+  width: 99%;
   left: 0px;
   background: #fff;
+  /*fix other elements on the page moving (on Chrome)*/
   -webkit-transform: translatez(0);
   -moz-transform: translatez(0);
   -ms-transform: translatez(0);
@@ -6888,7 +7022,7 @@ a.btnReport:hover {
 .filter-search-show {
   display: block !important;
 }
-.emailTemplatesPopupTableContainer .listViewEntries  .listViewEntryValue {
+.emailTemplatesPopupTableContainer .listViewEntries .listViewEntryValue {
   max-width: 100%;
   min-width: 150px;
 }
@@ -6923,12 +7057,15 @@ input:focus::-webkit-input-placeholder {
 input:focus:-moz-placeholder {
   color: transparent;
 }
+/* FF 4-18 */
 input:focus::-moz-placeholder {
   color: transparent;
 }
+/* FF 19+ */
 input:focus:-ms-input-placeholder {
   color: transparent;
 }
+/* IE 10+ */
 .global-actions .dropdown-menu:before {
   position: absolute;
   top: -7px;
@@ -6937,7 +7074,7 @@ input:focus:-ms-input-placeholder {
   border-right: 7px solid transparent;
   border-bottom: 7px solid #ccc;
   border-left: 7px solid transparent;
-  border-bottom-color: rgba(0,0,0,0.2);
+  border-bottom-color: rgba(0, 0, 0, 0.2);
   content: '';
 }
 .global-actions .dropdown-menu:after {
@@ -7122,6 +7259,7 @@ input:focus:-ms-input-placeholder {
   text-align: center;
 }
 #OnBoardLayout #OnBoardPageContainer .crmGoals textarea::-webkit-input-placeholder {
+  /* WebKit browsers */
   text-align: center;
   padding: 20%;
   font-size: 12px;
@@ -7267,19 +7405,19 @@ input:focus:-ms-input-placeholder {
   border-left: 3px solid #EF5E29;
   opacity: 1;
 }
-.nav .nav-stacks .cp-nav-header-wrapper>li.disabled>a:hover {
+.nav .nav-stacks .cp-nav-header-wrapper > li.disabled > a:hover {
   background-color: #fff;
 }
-.cp-nav-header-wrapper>li.disabled>a:hover {
+.cp-nav-header-wrapper > li.disabled > a:hover {
   border: 1px solid transparent;
 }
-.nav .nav-stacks .cp-nav-header-wrapper>li.disabled>a {
+.nav .nav-stacks .cp-nav-header-wrapper > li.disabled > a {
   background-color: #fff;
 }
-#portalModulesTable>li.portalModuleRow.active>a:hover {
+#portalModulesTable > li.portalModuleRow.active > a:hover {
   background-color: #fff !important;
 }
-#portalModulesTable>li.portalModuleRow.active>a:focus {
+#portalModulesTable > li.portalModuleRow.active > a:focus {
   background-color: #fff !important;
 }
 .portal-dashboard {
@@ -7375,14 +7513,14 @@ input:focus:-ms-input-placeholder {
 .portal-dashboard {
   border-bottom: 0px ! important;
 }
-#portal-shortcutsContainer>ul {
+#portal-shortcutsContainer > ul {
   border-bottom: 0px ! important;
 }
 #reportDetails .table-bordered {
   background: white;
 }
 .templateActions {
-  background: rgba(0,0,0,0.1);
+  background: rgba(0, 0, 0, 0.1);
   bottom: 0;
   text-align: center;
   position: absolute;
@@ -7529,121 +7667,3 @@ a.btnReport:hover {
   height: 450px;
   overflow: auto;
 }
-.fieldValue .value a {
-  color: #15c !important;
-}
-.editViewContents .fieldLabel {
-  min-width: 100px;
-  width: 20%;
-  word-break: break-all;
-}
-.editViewContents .fieldValue {
-  width:30%;
-}
-.editViewContents td.fieldValue[colspan="3"] {
-  width:80%;
-}
-.editViewContents textarea.textAreaElement {
-  width: 88%;
-}
-.editViewContents input[type="checkbox"] {
-  width: 15px;
-  height: 15px;
-}
-.editViewContents input[type="radio"] {
-  width: 15px;
-  height: 15px;
-}
-#composeEmailContainer .modal-body .quickCreateContent,
-#QuickCreate .modal-body .quickCreateContent,
-#create .quickCreateContent {
-  margin-top: 25px;
-}
-.settingsgroup-panel .widgetContainer .menuItemLabel .pinUnpinShortCut {
-  display: none;
-  margin-top: 2px;
-}
-.settingsgroup-panel .widgetContainer .menuItemLabel:hover .pinUnpinShortCut {
-  display: inline-block;
-}
-@-moz-document url-prefix() {
-  .duplicateHandlingContainer .tooltip-inner {
-    width: 550px;
-    max-width: 550px;
-  }
-}
-.duplicateHandlingContainer .tooltip-inner {
-  text-align: left !important;
-}
-.duplicateHandlingContainer .syncMessage {
-  margin-top: 5px !important;
-}
-.duplicateHandlingContainer .actionsList {
-  width: 230px !important;
-}
-.duplicationMessageContainer {
-  background-color: #f2dede !important;
-  color: #b94a48 !important;
-}
-.duplicationMessageContainer .duplicationMessageHeader {
-  margin-bottom: 8px;
-}
-.listViewRecordActions .quickView, .listViewRecordActions .markStar,
-.listViewRecordActions .markAsHeld,.listViewRecordActions .holdFollowupOn {
-  margin-top: 4px;
-}
-.app-menu .module-icon .custom-module {
-	font-size: 14px;
-	border-radius: 4px;
-	color: #000;
-	background-color: #fff;
-	padding: 4px 10px 4px 5px !important
-}
-.menu-item .custom-module {
-	font-family: 'OpenSans-Regular', sans-serif;
-	font-size: 12px;
-	border-radius: 4px;
-	padding: 2px;
-	color: #000;
-	background-color: #fff;
-}
-.modules-menu .custom-module {
-	color: #fff;
-	margin-left: 0px;
-	display: inline;
-	border: 1px solid #fff;
-	border-radius: 4px;
-	padding: 3px 4px 3px 2px !important;
-	font-weight: bold;
-}
-#quickCreateModules .custom-module, .workflowListContainer .custom-module, .dashBoardTabContents .custom-module {
-	border-radius: 4px;
-	padding: 3px 5px;
-	color: #fff;
-	background-color: #777;
-}
-.menuEditorItem .custom-module {
-	border-radius: 4px;
-	padding: 3px 5px;
-	color: #000;
-	background-color: #fff;
-}
-.task-details .custom-module {
-	border-radius: 4px;
-	padding: 1px 4px;
-	color: white;
-	background-color: #777;
-}
-.related-tabs .custom-module, #relatedmenuList .custom-module {
-	border-radius: 4px;
-	color: #fff;
-	background-color: #777;
-	padding: 5px 7px;
-	font-weight: bold;
-}
-.record-header .custom-module {
-	font-size: 30px;
-}
-.moduleIcon .custom-module {
-	font-weight: bold;
-}
\ No newline at end of file
diff --git a/layouts/v7/skins/marketing_and_sales/style.css b/layouts/v7/skins/marketing_and_sales/style.css
index 28c2a6f30c5060eb9afceab1a1702db6403b0eec..ac369cd3d1e58f66718b477fc89a12b241514b8e 100644
--- a/layouts/v7/skins/marketing_and_sales/style.css
+++ b/layouts/v7/skins/marketing_and_sales/style.css
@@ -1,7 +1,9 @@
 @font-face {
   font-family: 'Oswald';
   src: url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.eot');
-  src: url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.eot?#iefix') format('embedded-opentype'), url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.woff') format('woff'), url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.ttf') format('truetype'), url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.svg#Oswald') format('svg');
+  /* IE9 Compat Modes */
+  src: url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.svg#Oswald') format('svg');
+  /* Legacy iOS */
   font-weight: normal;
   font-style: normal;
   text-rendering: optimizeLegibility;
@@ -15,27 +17,37 @@ a:active {
 @font-face {
   font-family: 'OpenSans-Regular';
   src: url('../fonts/OpenSans/Regular/OpenSans-Regular.eot');
-  src: url('../fonts/OpenSans/Regular/OpenSans-Regular.ttf') format('truetype'), url('../fonts/OpenSans/Regular/OpenSans-Regular.eot?#iefix') format('embedded-opentype'), url('../fonts/OpenSans/Regular/OpenSans-Regular.woff2') format('woff2'), url('../fonts/OpenSans/Regular/OpenSans-Regular.woff') format('woff'), url('../fonts/OpenSans/Regular/OpenSans-Regular.svg#svgFontName') format('svg');
+  /* IE9 Compat Modes */
+  src: url('../fonts/OpenSans/Regular/OpenSans-Regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/OpenSans/Regular/OpenSans-Regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/OpenSans/Regular/OpenSans-Regular.woff2') format('woff2'), /* Super Modern Browsers */ url('../fonts/OpenSans/Regular/OpenSans-Regular.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/OpenSans/Regular/OpenSans-Regular.svg#svgFontName') format('svg');
+  /* Legacy iOS */
 }
 @font-face {
   font-family: 'OpenSans-Semibold';
   src: url('../fonts/OpenSans/Semibold/OpenSans-Semibold.eot');
-  src: url('../fonts/OpenSans/Semibold/OpenSans-Semibold.ttf') format('truetype'), url('../fonts/OpenSans/Semibold/OpenSans-Semibold.eot?#iefix') format('embedded-opentype'), url('../fonts/OpenSans/Semibold/OpenSans-Semibold.woff2') format('woff2'), url('../fonts/OpenSans/Semibold/OpenSans-Semibold.woff') format('woff'), url('../fonts/OpenSans/Semibold/OpenSans-Semibold.svg#svgFontName') format('svg');
+  /* IE9 Compat Modes */
+  src: url('../fonts/OpenSans/Semibold/OpenSans-Semibold.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/OpenSans/Semibold/OpenSans-Semibold.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/OpenSans/Semibold/OpenSans-Semibold.woff2') format('woff2'), /* Super Modern Browsers */ url('../fonts/OpenSans/Semibold/OpenSans-Semibold.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/OpenSans/Semibold/OpenSans-Semibold.svg#svgFontName') format('svg');
+  /* Legacy iOS */
 }
 @font-face {
   font-family: 'ProximaNova-Regular';
-  src: url('../fonts/ProximanovaWebfont/ProximaNova-Regular.ttf') format('truetype'), url('../fonts/ProximanovaWebfont/ProximaNova-Regular.woff') format('woff'), url('../fonts/ProximanovaWebfont/ProximaNova-Regular.eot?#iefix') format('embedded-opentype');
+  src: url('../fonts/ProximanovaWebfont/ProximaNova-Regular.ttf') format('truetype'), url('../fonts/ProximanovaWebfont/ProximaNova-Regular.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/ProximanovaWebfont/ProximaNova-Regular.eot?#iefix') format('embedded-opentype');
+  /* IE6-IE8 */
+  /* Safari, Android, iOS */
   font-style: normal;
   font-weight: normal;
   text-rendering: optimizeLegibility;
 }
 @font-face {
   font-family: 'ProximaNova-Semibold';
-  src: url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.ttf') format('truetype'), url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.woff') format('woff'), url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.eot?#iefix') format('embedded-opentype');
+  src: url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.eot?#iefix') format('embedded-opentype');
+  /* IE6-IE8 */
   font-style: normal;
   font-weight: normal;
   text-rendering: optimizeLegibility;
 }
+/**********************************/
+/************ Layout **************/
+/**********************************/
 html {
   height: 100%;
   overflow-y: auto;
@@ -102,6 +114,7 @@ body {
 @media (min-width: 992px) {
   .global-nav .logo-container {
     display: inline-block;
+    width: 150px;
     z-index: 2;
     padding-left: 6%;
     margin-top: 1px;
@@ -113,11 +126,13 @@ body {
     position: absolute;
     width: 100%;
     height: 42px;
+    /*        border-top:1px solid #ddd;*/
     border-bottom: 1px solid #ddd;
   }
   .app-nav .module-action-bar .module-action-content {
     background: #FBFBFB;
     height: 41px;
+    /*        border-bottom: 1px solid #eee;*/
   }
   .app-nav .module-action-bar .module-action-content .navbar-right {
     margin-right: 0;
@@ -163,7 +178,7 @@ body {
     padding-left: 0;
   }
 }
-.btn-toolbar >.btn-group:first-child {
+.btn-toolbar > .btn-group:first-child {
   margin-left: 5px;
 }
 .vt-notification {
@@ -196,15 +211,19 @@ body {
 .vt-notification [data-notify="message"] {
   color: #eaeaea;
 }
+/**********************************/
+/******** Navigation styles *******/
+/**********************************/
 .company-logo {
   height: 40px;
+  width: 150px;
   margin: 0 0;
   display: inline-block;
   margin-left: 1px;
 }
 .company-logo img {
-  max-height: 100%;
-  max-width: 100%;
+  height: 100%;
+  width: auto;
 }
 .navbar .fa {
   font-size: 15px;
@@ -214,10 +233,13 @@ body {
   font-size: 16px;
   position: relative;
 }
+/*.module-action-bar .module-action-content #appnav{
+    padding-top:5px;
+}*/
 .global-nav .navbar-nav > li div a {
   padding: 15px;
 }
-.global-nav>ul {
+.global-nav > ul {
   margin-right: 20px;
 }
 .global-nav .search-links-container {
@@ -267,26 +289,28 @@ body {
     float: right;
     height: 42px;
   }
-  .module-action-bar .navbar-right .nav>li {
+  .module-action-bar .navbar-right .nav > li {
     display: inline-block;
   }
-  .module-action-bar .navbar-right .nav>li a {
+  .module-action-bar .navbar-right .nav > li a {
     padding: 0 10px;
   }
   .global-nav .logo-container {
     border-bottom: 0;
+    width: 150px;
   }
 }
 @media (max-width: 991px) {
   .global-nav .logo-container {
     border-bottom: 0;
+    width: 150px;
   }
   .notificationMessageHolder {
     padding-left: 45%;
   }
 }
 @media (min-width: 991px) {
-  .nav>li>a.qc-button {
+  .nav > li > a.qc-button {
     padding: 2px 3px;
     margin-top: 13px;
     margin-right: 15px;
@@ -294,7 +318,7 @@ body {
     color: #fff;
     border-radius: 20px;
   }
-  .nav>li>a.qc-button span {
+  .nav > li > a.qc-button span {
     vertical-align: top;
   }
 }
@@ -313,6 +337,7 @@ body {
   width: 100%;
   height: 100%;
 }
+/** App Nav Styles */
 .active-app-title {
   white-space: nowrap;
   font-family: Oswald, "OpenSans-Semibold", "Helvetica Neue", Helvetica, sans-serif;
@@ -367,7 +392,9 @@ body {
   height: 42px;
   text-align: center;
   line-height: 42px;
+  /*    background-color: #2c3b49;*/
   color: #ffffff;
+  /*border-bottom: 1px solid #272B46;*/
 }
 .app-nav .app-indicator-icon-container .app-indicator-icon {
   font-size: 24px;
@@ -479,16 +506,16 @@ body {
   right: -4px;
 }
 #overlayPageContent .mCSB_scrollTools,
-#overlayPageContent .mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar,
-#overlayPageContent .mCSB_scrollTools .mCSB_buttonUp,
-#overlayPageContent .mCSB_scrollTools .mCSB_buttonDown,
-#overlayPageContent .mCSB_scrollTools .mCSB_buttonLeft,
-#overlayPageContent .mCSB_scrollTools .mCSB_buttonRight,
 .app-list .mCSB_scrollTools,
+#overlayPageContent .mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar,
 .app-list .mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar,
+#overlayPageContent .mCSB_scrollTools .mCSB_buttonUp,
 .app-list .mCSB_scrollTools .mCSB_buttonUp,
+#overlayPageContent .mCSB_scrollTools .mCSB_buttonDown,
 .app-list .mCSB_scrollTools .mCSB_buttonDown,
+#overlayPageContent .mCSB_scrollTools .mCSB_buttonLeft,
 .app-list .mCSB_scrollTools .mCSB_buttonLeft,
+#overlayPageContent .mCSB_scrollTools .mCSB_buttonRight,
 .app-list .mCSB_scrollTools .mCSB_buttonRight {
   -webkit-transition: none;
   transition: none;
@@ -700,6 +727,7 @@ a.menu-item:hover {
   width: 0px;
   overflow: hidden;
 }
+/* User Logout */
 .logout-content {
   padding: 10px;
   width: 350px;
@@ -754,6 +782,9 @@ a.menu-item:hover {
 .app-settings {
   background: #FFFFFF;
 }
+/*************************************************/
+/******** View styles (List/Edit/Detail..) *******/
+/*************************************************/
 .viewContent .content-area {
   padding-left: 50px;
 }
@@ -791,7 +822,6 @@ a.menu-item:hover {
 .fieldValue .value {
   max-width: 85%;
   display: inline-block;
-  word-break: break-word;
 }
 .modal-header button.close {
   padding: 0;
@@ -865,6 +895,9 @@ input[type="password"].inputElement {
   padding-right: 20px;
   padding-left: 20px;
 }
+/**********************************/
+/**** Side vertical Nav styles ****/
+/**********************************/
 .module-nav {
   background: #fff;
   z-index: 1004;
@@ -880,6 +913,9 @@ input[type="password"].inputElement {
   left: 0;
   transition: 0s width;
 }
+.module-nav:hover {
+  /*z-index: 1001;*/
+}
 .modules-menu ul {
   list-style: none;
   margin-left: 0;
@@ -914,7 +950,7 @@ input[type="password"].inputElement {
   float: left;
   font-size: 20px;
 }
-.modules-menu ul li a>span {
+.modules-menu ul li a > span {
   margin-left: 10px;
   vertical-align: middle;
   font-size: 13px;
@@ -954,6 +990,7 @@ input[type="password"].inputElement {
   width: 100%;
   left: 0%;
 }
+/** Lists Menu in Side bar */
 .module-filters .settings-sidebar,
 .module-filters .sidebar-container {
   padding: 0 12px;
@@ -987,6 +1024,7 @@ input[type="password"].inputElement {
 .lists-menu-container hr {
   margin: 5px 0;
 }
+/* mScrollbar customization for lists widget */
 .lists-menu-container .menu-scroller .mCSB_scrollTools {
   width: 13px;
 }
@@ -998,8 +1036,10 @@ input[type="password"].inputElement {
 .modules-menu .mCSB_scrollTools .mCSB_draggerContainer {
   left: 8px;
 }
+/* Customization ends */
 .lists-menu-container .list-menu-content .more-less-link {
   color: #fff;
+  /*text-decoration: none;*/
 }
 .lists-menu-container .list-menu-content .sub-header {
   color: #ddd;
@@ -1104,9 +1144,11 @@ input[type="password"].inputElement {
 .common-links-container > div a {
   color: #fff;
 }
+/*Search Container styles */
 .search-container {
   min-height: 300px;
   position: absolute;
+  /*z-index: 1030;*/
   width: 100%;
   top: 0;
   background: #FBFBFB;
@@ -1125,6 +1167,7 @@ input[type="password"].inputElement {
 .footer p {
   margin: 5px 0;
 }
+/*** Utilities ***/
 .showElement {
   display: block !important;
   height: 100%;
@@ -1247,11 +1290,11 @@ ul.unstyled {
 }
 .emptyRecordsDiv .emptyRecordsContent {
   display: inline-block;
-  font-size: 16px;
   left: 50%;
   margin-left: -25%;
   position: absolute;
   width: 50%;
+  font-size: 16px;
 }
 .textOverflowEllipsis {
   overflow: hidden;
@@ -1276,6 +1319,9 @@ ul.unstyled {
 .removeNoFileChosen {
   color: transparent !important;
 }
+/***********************************
+**********Button Styles**********
+***********************************/
 .module-buttons-container {
   float: right;
   margin-right: 10px;
@@ -1297,6 +1343,7 @@ ul.unstyled {
   margin: 4px 2px;
   border-radius: 2px;
   border: 1px solid #ddd;
+  text-transform: uppercase;
   color: #666;
   background: #fff;
 }
@@ -1317,6 +1364,9 @@ ul.unstyled {
   color: #FFFFFF !important;
   background: #5bc0de !important;
 }
+/***********************************
+**********List View Styles**********
+***********************************/
 .fa.pull-left {
   margin-right: 0;
 }
@@ -1351,7 +1401,7 @@ ul.unstyled {
   font-size: 20px;
 }
 .listview-pagination .disabled {
-  color: rgba(0,0,0,0.2);
+  color: rgba(0, 0, 0, 0.2);
 }
 .listview-pagination .disabled:hover {
   cursor: default;
@@ -1379,6 +1429,8 @@ ul.unstyled {
 .listview-table {
   margin-bottom: 0;
   border-top: 0;
+  /* Horizontal scroll will not work if table layout Fixed */
+  /*    table-layout: fixed;*/
 }
 .listview-table tr td,
 .listview-table tr th {
@@ -1408,7 +1460,7 @@ ul.unstyled {
   width: 100%;
 }
 .listViewEntries .relatedListEntryValues .fieldValue .value,
-.listViewEntries  .listViewEntryValue .fieldValue .value {
+.listViewEntries .listViewEntryValue .fieldValue .value {
   vertical-align: middle;
   width: 100%;
   display: inline-block;
@@ -1423,7 +1475,7 @@ ul.unstyled {
 }
 .listview-table-norecords .table-actions,
 .listview-table .table-actions {
-  width: 120px;
+  width: 110px;
   font-size: 15px;
   color: #555;
   margin-left: 7px;
@@ -1489,13 +1541,13 @@ input[type=checkbox]:checked {
   vertical-align: middle;
   display: table-cell;
 }
-.listview-table  tr.searchRow th {
+.listview-table tr.searchRow th {
   padding: 5px 3px;
 }
-.listview-table  tr.searchRow th.inline-search-btn {
+.listview-table tr.searchRow th.inline-search-btn {
   padding: 3px 10px;
 }
-.listview-table  tr.searchRow th.inline-search-btn button {
+.listview-table tr.searchRow th.inline-search-btn button {
   text-align: center;
   width: 85%;
   text-shadow: none;
@@ -1523,6 +1575,18 @@ input[type=checkbox]:checked {
   background-color: #FFEEEE !important;
   background-image: none !important;
 }
+/*.floatThead-wrapper .table-container{
+    z-index: 0 !important;
+}*/
+/* List view bottom fixed scroll */
+/*.bottom-fixed-scroll{
+    height: 14px;
+    position: relative;
+    top: -15px;
+    overflow-x: auto;
+    overflow-y: hidden;
+    width: 100%;
+}*/
 .scroller-div {
   height: 1px;
 }
@@ -1644,12 +1708,12 @@ input[type=checkbox]:checked {
 #listColumnFilterContainer .disabled i {
   color: #ccc;
 }
+/**********************************
+**********Detail View Styles**********
+**********************************/
 .detailViewButtoncontainer {
   padding-top: 5px;
 }
-.detailViewButtoncontainer button.btn {
-  margin: 0px 1px !important;
-}
 .detailview-header .recordBasicInfo > .info-row {
   margin-bottom: 4px;
 }
@@ -1730,9 +1794,6 @@ th {
   margin-top: 3%;
   margin-right: 2%;
 }
-.overlayDetailHeader button.btn {
-  margin: 0px 1px !important;
-}
 .referencefield-wrapper .createReferenceRecord {
   float: left;
   margin-left: 5px;
@@ -1972,10 +2033,10 @@ th {
   z-index: 1030;
 }
 .overlay-container-60 {
-  margin-left: 42px;
+  margin-left: 42px ;
 }
 .overlay-container-300 {
-  margin-left: 230px;
+  margin-left: 230px ;
 }
 .overlayPageContent {
   background: #FFFFFF;
@@ -2098,6 +2159,9 @@ th {
   height: 26px;
   line-height: 25px;
 }
+/**********************************
+**********Summary View Styles******
+**********************************/
 .summary-table {
   width: 100%;
   table-layout: fixed;
@@ -2218,33 +2282,33 @@ th {
   opacity: 1;
   cursor: pointer;
 }
-.details.row >form .social-media-toggle {
+.details.row > form .social-media-toggle {
   position: absolute;
   right: -15px;
   display: inline-block;
   width: 500px;
   border-left: 0px;
 }
-.details.row >form .social-media-widget {
+.details.row > form .social-media-widget {
   border-left: 1px solid #ddd;
   border-bottom: 1px solid #ddd;
   height: 100%;
   background: white;
 }
-.details.row >form div[class*="col-"].resizable-summary-view {
+.details.row > form div[class*="col-"].resizable-summary-view {
   padding-left: 0;
   padding-right: 0px;
 }
-.details.row >form>div[class*="col-"],
-.details.row >form .resizable-summary-view div[class*="col-"] {
+.details.row > form > div[class*="col-"],
+.details.row > form .resizable-summary-view div[class*="col-"] {
   padding-right: 0;
   padding: 0px 5px;
 }
-.details.row >form>div[class*="col-"]:first-child,
-.details.row >form .left-block {
+.details.row > form > div[class*="col-"]:first-child,
+.details.row > form .left-block {
   padding-left: 0 !important;
 }
-.details.row >form>div[class*="col-"]:last-child {
+.details.row > form > div[class*="col-"]:last-child {
   padding-right: 0;
 }
 .summaryWidgetContainer .noContent {
@@ -2257,6 +2321,9 @@ th {
 .caseReplyArea .nav > li {
   padding: 0 10px;
 }
+/**********************************
+**********Edit View Styles*******
+**********************************/
 .main-container .editViewModNavigator.module-nav,
 .editViewModNavigator .mod-switcher-container,
 .editViewModNavigator .modules-menu {
@@ -2297,7 +2364,7 @@ th {
   width: 100%;
 }
 .editViewContents .input-group {
-  width: 229px;
+  width: 208px;
   float: left;
 }
 .input-group.inputElement .input-group-addon {
@@ -2376,6 +2443,9 @@ th {
   z-index: 1000;
   padding: 7px;
 }
+/**********************************
+**********Advance Search styles**********
+**********************************/
 .op0.fadeInx {
   opacity: 1;
 }
@@ -2448,7 +2518,11 @@ th {
 }
 .btn + input {
   margin-left: 5px;
+  /*    margin-top : 3px;*/
 }
+/**********************************
+**********Extension Store Styles**********
+**********************************/
 .extensionstore .app-trigger {
   width: 98%;
 }
@@ -2479,6 +2553,9 @@ th {
 .extensionContents .extensionError {
   color: #F10404;
 }
+/**********************************
+**********Extension Store Nav Bar**********
+**********************************/
 .tabbable-line > .nav-tabs {
   border: none;
   margin: 0px;
@@ -2547,6 +2624,9 @@ th {
 .extensionContents .listview-table {
   width: 100%;
 }
+/*******************************************
+******Detail View related list styles*******
+********************************************/
 .relatedContents .listViewContentHeaderValues:hover {
   text-decoration: none;
   color: #333;
@@ -2604,6 +2684,9 @@ th {
 .relatedViewActions .btn-group {
   margin-right: 15px;
 }
+/*******************************************
+****************** Modal *******************
+********************************************/
 .modal-header {
   padding: 5px 15px;
   background: #596875;
@@ -2631,6 +2714,7 @@ th {
   width: 100%;
   float: left;
   background: #596875;
+  /*    height: 100%;*/
 }
 .settings-menu {
   display: inline-block;
@@ -2647,7 +2731,7 @@ th {
   cursor: n-resize;
 }
 .settings-menu-items {
-  box-shadow: 0 1px 1px rgba(0,0,0,0.05);
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
   margin-bottom: 10px;
   text-align: justify;
 }
@@ -2765,9 +2849,6 @@ th {
 .active .stepNum {
   color: #FFFFFF;
 }
-.mailBoxEditDiv .crumbs li {
-  width: 22%;
-}
 .stepNum {
   display: inline-block;
   padding: 0 5px;
@@ -2776,6 +2857,7 @@ th {
   vertical-align: middle;
   color: #3399ff;
 }
+/* .squaredFour */
 .squaredFour {
   width: 20px;
   position: relative;
@@ -2789,9 +2871,9 @@ th {
   top: 0;
   left: 0;
   background: #fcfff4;
-  background: linear-gradient(top,#fcfff4 0%,#dfe5d7 40%,#b3bead 100%);
+  background: linear-gradient(top, #fcfff4 0%, #dfe5d7 40%, #b3bead 100%);
   border-radius: 4px;
-  box-shadow: inset 0px 1px 1px white, 0px 1px 3px rgba(0,0,0,0.5);
+  box-shadow: inset 0px 1px 1px white, 0px 1px 3px rgba(0, 0, 0, 0.5);
 }
 .squaredFour label:after {
   content: '';
@@ -2819,13 +2901,16 @@ th {
 .importBlockContainer {
   color: #596875;
 }
+/******************************************* 
+************* Social Buttons *************** 
+********************************************/
 .btn-block + .btn-block {
   margin-top: 5px;
 }
 .btn-google-plus {
   color: #FFFFFF !important;
   background-color: #DD4B39;
-  border-color: rgba(0,0,0,0.2);
+  border-color: rgba(0, 0, 0, 0.2);
 }
 .btn-social {
   position: relative;
@@ -2844,15 +2929,18 @@ th {
   line-height: 34px;
   font-size: 1.6em;
   text-align: center;
-  border-right: 1px solid rgba(0,0,0,0.2);
+  border-right: 1px solid rgba(0, 0, 0, 0.2);
 }
+/******************************************* 
+************* Updates Timeline *************** 
+********************************************/
 .recentActivitiesContainer .history {
   margin: 0 auto;
   padding: 20px 20px 1px;
   max-width: 100%;
   overflow-x: visible;
-  -webkit-transition: opacity .2s ease-out;
-  transition: opacity .2s ease-out;
+  -webkit-transition: opacity 0.2s ease-out;
+  transition: opacity 0.2s ease-out;
 }
 .updates_timeline {
   padding-top: 20px;
@@ -2861,6 +2949,7 @@ th {
   padding: 0;
   list-style: none;
 }
+/* The line */
 .updates_timeline:before {
   content: '';
   position: absolute;
@@ -2879,6 +2968,7 @@ th {
   min-height: 40px;
   z-index: 2;
 }
+/* Left Content(Time) */
 .updates_timeline > li .update_time {
   position: absolute;
   margin: 0;
@@ -2890,6 +2980,7 @@ th {
   font-size: 15px;
   font-style: italic;
 }
+/* Right content(Update info) */
 .updates_timeline > li .update_info {
   padding: 10px 10px 1px;
   display: block;
@@ -2898,10 +2989,11 @@ th {
   position: relative;
   top: -45px;
 }
-.updates_timeline > li .update_info >h3 {
+.updates_timeline > li .update_info > h3 {
   font-size: 1.1em;
   margin-left: -3%;
 }
+/* The icons  */
 .updates_timeline > li .update_icon {
   position: relative;
   border-radius: 50%;
@@ -2914,6 +3006,7 @@ th {
   color: #fff;
   line-height: 35px;
 }
+/* More Button */
 .updates_timeline #more_button .update_icon {
   position: relative;
   border-radius: 0;
@@ -3021,6 +3114,9 @@ th {
   vertical-align: super;
   font-size: 13px;
 }
+/******************************************* 
+************* Task Management ************** 
+********************************************/
 #taskManagementContainer .data-body {
   margin-bottom: 50px;
 }
@@ -3083,15 +3179,16 @@ th {
 #taskManagementContainer .other-details {
   color: #979797;
 }
+/*overwriting jquery ui css*/
 .ui-menu {
   z-index: 10000;
 }
 #taskManagementContainer button.active {
   background: #3B83F7;
   color: white;
-  text-shadow: 0 1px rgba(0,0,0,0.3);
+  text-shadow: 0 1px rgba(0, 0, 0, 0.3);
   border: 1px solid #135fd7;
-  box-shadow: inset 0 1px 2px rgba(0,0,0,0.3);
+  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.3);
 }
 .taskSubject {
   width: 99%;
@@ -3099,6 +3196,9 @@ th {
 #taskManagementContainer .mCustomScrollbar .mCSB_inside > .mCSB_container {
   margin-right: 13px;
 }
+/******************************************* 
+************* Settings Page ************** 
+********************************************/
 .settingsPageDiv.content-area {
   margin-right: 0;
 }
@@ -3132,6 +3232,9 @@ th {
 .settingsgroup-accordion a i {
   margin-right: 5px;
 }
+.settingsgroup-accordion a span {
+  text-transform: uppercase;
+}
 .settingsgroup {
   background: #2C3B49;
   height: 100%;
@@ -3288,35 +3391,59 @@ th {
 }
 .mini-slider-control[data-value="0"] .ui-slider-handle {
   background: #7d7e7d;
-  background: -moz-linear-gradient(top,#7d7e7d 0%,#0e0e0e 100%);
-  background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#7d7e7d),color-stop(100%,#0e0e0e));
-  background: -webkit-linear-gradient(top,#7d7e7d 0%,#0e0e0e 100%);
-  background: -o-linear-gradient(top,#7d7e7d 0%,#0e0e0e 100%);
-  background: -ms-linear-gradient(top,#7d7e7d 0%,#0e0e0e 100%);
-  background: linear-gradient(to bottom,#7d7e7d 0%,#0e0e0e 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#7d7e7d',endColorstr='#0e0e0e',GradientType=0);
+  /* Old browsers */
+  background: -moz-linear-gradient(top, #7d7e7d 0%, #0e0e0e 100%);
+  /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #7d7e7d), color-stop(100%, #0e0e0e));
+  /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #7d7e7d 0%, #0e0e0e 100%);
+  /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top, #7d7e7d 0%, #0e0e0e 100%);
+  /* Opera 11.10+ */
+  background: -ms-linear-gradient(top, #7d7e7d 0%, #0e0e0e 100%);
+  /* IE10+ */
+  background: linear-gradient(to bottom, #7d7e7d 0%, #0e0e0e 100%);
+  /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#7d7e7d', endColorstr='#0e0e0e', GradientType=0);
+  /* IE6-9 */
   margin-left: 0px;
 }
 .mini-slider-control[data-value="1"] .ui-slider-handle {
   background: #ffb76b;
-  background: -moz-linear-gradient(top,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#ffb76b),color-stop(0%,#ffa73d),color-stop(49%,#ff7c00),color-stop(100%,#ff7f04));
-  background: -webkit-linear-gradient(top,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  background: -o-linear-gradient(top,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  background: -ms-linear-gradient(top,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  background: linear-gradient(to bottom,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffb76b',endColorstr='#ff7f04',GradientType=0);
+  /* Old browsers */
+  background: -moz-linear-gradient(top, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffb76b), color-stop(0%, #ffa73d), color-stop(49%, #ff7c00), color-stop(100%, #ff7f04));
+  /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* Opera 11.10+ */
+  background: -ms-linear-gradient(top, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* IE10+ */
+  background: linear-gradient(to bottom, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffb76b', endColorstr='#ff7f04', GradientType=0);
+  /* IE6-9 */
   margin-left: -6px;
 }
 .mini-slider-control[data-value="2"] .ui-slider-handle {
   background: #bfd255;
-  background: -moz-linear-gradient(top,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#bfd255),color-stop(79%,#8eb92a),color-stop(100%,#72aa00),color-stop(100%,#9ecb2d));
-  background: -webkit-linear-gradient(top,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  background: -o-linear-gradient(top,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  background: -ms-linear-gradient(top,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  background: linear-gradient(to bottom,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bfd255',endColorstr='#9ecb2d',GradientType=0);
+  /* Old browsers */
+  background: -moz-linear-gradient(top, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #bfd255), color-stop(79%, #8eb92a), color-stop(100%, #72aa00), color-stop(100%, #9ecb2d));
+  /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* Opera 11.10+ */
+  background: -ms-linear-gradient(top, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* IE10+ */
+  background: linear-gradient(to bottom, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bfd255', endColorstr='#9ecb2d', GradientType=0);
+  /* IE6-9 */
   margin-left: -13px;
 }
 .ModulemanagerSettings .moduleblock .hiden {
@@ -3341,10 +3468,13 @@ th {
 th {
   padding: 6px;
 }
+/******************************************* 
+********** CustomerPortal styles start ********
+********************************************/
 .cp-tabs .enabledModules {
   display: inline-block ! important;
-  margin-left: 4px !important;
-  margin-right: 4px !important;
+  margin-left: 4px!important;
+  margin-right: 4px!important;
   vertical-align: top;
 }
 .drag-portal-module {
@@ -3451,7 +3581,7 @@ th {
   margin-left: 5px;
 }
 .portal-field-delete {
-  margin-left: 45px !important;
+  margin-left: 45px!important;
 }
 .portalModuleRow {
   border-left: 4px solid #3CB878 !important;
@@ -3468,7 +3598,7 @@ th {
   content: "*";
   color: red;
 }
-.nav-tabs .cp-modules > .active >a,
+.nav-tabs .cp-modules > .active > a,
 .nav-tabs .cp-modules > .active > a:hover {
   border: 0px !important;
   border-top-right-radius: 0px;
@@ -3630,7 +3760,7 @@ th {
   display: inline-block;
 }
 .quickPreview .updates_timeline:before {
-  background: #e6e6e6;
+  background: #e5e5e5;
   width: 2px;
   margin-left: -1%;
 }
@@ -3645,13 +3775,16 @@ th {
 .quickPreviewComments .recentComments .commentDetails .comment {
   line-height: 15px;
 }
-.quickPreviewComments  .summaryWidgetContainer {
+.quickPreviewComments .summaryWidgetContainer {
   border: 0;
   padding: 0;
 }
 .quickPreview .recentActivitiesContainer .history {
   padding: 0;
 }
+/******************************************* 
+********** Calendar view styles ************
+********************************************/
 .calendar-sidebar {
   width: 100% !important;
 }
@@ -3808,6 +3941,11 @@ th {
   display: inline-block;
   text-align: center;
 }
+/******************************************* 
+********** Calendar view styles end ********
+
+********** Documents Module styles *********
+********************************************/
 .dragdrop-dotted {
   border: 2px dashed #C0C0C0;
   min-width: 300px;
@@ -3867,13 +4005,16 @@ tr.file > td.fileOwnerData {
   width: 100px;
   white-space: pre-wrap;
 }
+/******************************************* 
+********** Documents Module styles end *****
+********************************************/
 .engagementsContainer .engagements_content {
   padding-top: 15px;
 }
 .summaryWidgetContainer .engagementsContainer table {
   width: inherit;
 }
-.engagements_content table thead>tr:first-child {
+.engagements_content table thead > tr:first-child {
   border: 1px solid #CCC;
   background-color: #F5F5F5;
 }
@@ -3924,6 +4065,9 @@ tr.file > td.fileOwnerData {
   font-size: 15px;
   padding: 1% 0;
 }
+/******************************************* 
+********** Mailroom view styles start ********
+********************************************/
 .mailroomBanner {
   margin: 23px 0;
   height: 215px;
@@ -4132,6 +4276,7 @@ tr.file > td.fileOwnerData {
   margin-left: 0;
 }
 .mentionMessages .mention_follow_up {
+  /*//load this color from variable.less*/
   background-color: green;
 }
 .modelContainer .modal-content {
@@ -4280,6 +4425,7 @@ form[name="notification_settings"] .select2-choice {
   margin-left: 0;
 }
 .mentionMessages .mention_follow_up {
+  /*//load this color from variable.less*/
   background-color: green;
 }
 .modal-content .mention_followup .row {
@@ -4311,6 +4457,9 @@ form[name="notification_settings"] .select2-choice {
 .mentionMessageHeader .MultiFile-remove {
   color: #FFFFFF;
 }
+/******************************************* 
+********** Mailroom view styles end ********
+********************************************/
 .detailview-header {
   margin-bottom: 10px;
 }
@@ -4326,6 +4475,7 @@ form[name="notification_settings"] .select2-choice {
   margin: 0px 10px;
   text-decoration: underline !important;
   color: #3498DB;
+  /*font-size : 12px;*/
 }
 .tag {
   display: inline-block;
@@ -4409,11 +4559,10 @@ form[name="notification_settings"] .select2-choice {
   border: 1px solid #dcdcdc;
 }
 #tagCloud .tag {
-  color: #5ea9dd;
-  padding: 0px;
   background-color: #FFFFFF;
   border-color: #FFFFFF;
   border-radius: 0px;
+  color: #5ea9dd;
   margin: 3px;
 }
 #tagCloud .tag[data-type="public"] {
@@ -4424,6 +4573,9 @@ form[name="notification_settings"] .select2-choice {
   max-width: 80px;
   vertical-align: bottom;
 }
+/******************************************* 
+********** Groups view styles ********
+********************************************/
 #s2id_memberList li > div,
 .groupMembersColors li > div {
   margin-left: 10px;
@@ -4498,6 +4650,12 @@ form[name="notification_settings"] .select2-choice {
   margin: 0px;
   color: #444444;
 }
+/******************************************* 
+********** Groups view styles  ends********
+********************************************/
+/******************************************* 
+********** Picklist Css ********
+********************************************/
 .pickListValue {
   background-color: #FFFFFF;
 }
@@ -4512,6 +4670,12 @@ form[name="notification_settings"] .select2-choice {
   padding: 2px 1px !important;
   line-height: 15px;
 }
+/******************************************* 
+************* Dashboard Styles *************
+********************************************/
+li.dashboardWidget {
+  overflow: auto;
+}
 .dashboardWidgetHeader .title {
   padding-bottom: 10px;
   font-size: 15px;
@@ -4532,9 +4696,6 @@ form[name="notification_settings"] .select2-choice {
 .dashBoardContainer .tabContainer .tab-content {
   margin-top: 10px;
 }
-.dashBoardContainer .dashBoardTabContents ul {
-  margin: 0;
-}
 .dashBoardContainer .dashBoardTabContents ul li {
   border: 3px solid #E2E2E4;
   box-shadow: 1px;
@@ -4601,7 +4762,7 @@ form[name="notification_settings"] .select2-choice {
   display: inline-block;
   opacity: 1;
 }
-.dashBoardContainer .tabContainer li a  .deleteTab:hover {
+.dashBoardContainer .tabContainer li a .deleteTab:hover {
   cursor: pointer;
 }
 #minilistWizardContainer .fieldLabel {
@@ -4638,6 +4799,9 @@ form[name="notification_settings"] .select2-choice {
   resize: none;
   width: 100%;
 }
+/******************************************* 
+********** Picklist DependencyGraph ********
+********************************************/
 #dependencyGraph .tableHeading {
   text-align: center;
   padding-top: 30px;
@@ -4663,12 +4827,15 @@ form[name="notification_settings"] .select2-choice {
 #dependencyGraph .dependencyMapping .pickListDependencyTable .selectedCell {
   background: #a9cbf5;
 }
+/******************************************* 
+********** Rewriting select2 for consistency********
+********************************************/
 .select2-container .select2-choice {
   height: 29px;
   border-radius: 1px;
 }
 .modal {
-  z-index: 1100;
+  z-index: 1070;
 }
 .select2-container .select2-choice {
   height: 28px;
@@ -4756,6 +4923,7 @@ hr {
   position: fixed;
   bottom: 0;
   background: #EFEFEF;
+  /*width:100%;*/
   border-left: 42px solid #2c3b49;
   height: 60px;
   left: 0;
@@ -4774,7 +4942,6 @@ hr {
 }
 .settingsPageDiv .modal-overlay-footer {
   margin-left: 230px;
-  border-left: 0px solid;
 }
 .settingsOverlayContainer .modal-overlay-footer {
   margin: 0;
@@ -4797,14 +4964,14 @@ hr {
   vertical-align: middle;
   margin-top: 6px;
 }
-.list-menu-content .pull-right>.dropdown-menu {
+.list-menu-content .pull-right > .dropdown-menu {
   left: -126px;
   position: relative;
 }
-.dropdown-menu>li>a {
+.dropdown-menu > li > a {
   padding: 4px 6px;
 }
-.dropdown-menu>li>a span i {
+.dropdown-menu > li > a span i {
   font-size: 15px;
   vertical-align: middle;
 }
@@ -4812,11 +4979,11 @@ hr {
   max-height: 300px;
   padding-left: 0;
 }
-.related-tabs .dropdown-menu>.mCustomScrollBox>.mCSB_container {
+.related-tabs .dropdown-menu > .mCustomScrollBox > .mCSB_container {
   margin-right: 0;
   padding: 4px 6px;
 }
-.related-tabs .dropdown-menu>.mCustomScrollBox>.mCSB_container>li>a {
+.related-tabs .dropdown-menu > .mCustomScrollBox > .mCSB_container > li > a {
   display: block;
   padding: 3px 5px;
   clear: both;
@@ -4825,7 +4992,7 @@ hr {
   color: #333;
   white-space: nowrap;
 }
-.related-tabs .dropdown-menu>.mCustomScrollBox>.mCSB_container span i {
+.related-tabs .dropdown-menu > .mCustomScrollBox > .mCSB_container span i {
   font-size: 15px;
   vertical-align: middle;
 }
@@ -4848,16 +5015,16 @@ hr {
 .calendar-sidebar .calendar-sidebar-tabs.padding {
   padding-left: 20px !important;
 }
-.related-tabs.row .nav>li {
+.related-tabs.row .nav > li {
   padding: 0 10px;
   margin: 0 2px;
 }
-.massEditTabs.nav>li {
+.massEditTabs.nav > li {
   padding: 0 10px;
   margin: 0 4px;
 }
-.row .nav>li>a,
-.row .nav>li>a:hover {
+.row .nav > li > a,
+.row .nav > li > a:hover {
   padding: 10px 3px;
   border: none;
   vertical-align: bottom;
@@ -4867,38 +5034,39 @@ hr {
   -webkit-box-sizing: border-box;
   -o-box-sizing: border-box;
 }
-.row .nav>li>a:hover {
+.row .nav > li > a:hover {
   border-bottom-color: #555;
 }
-TN-34230
-
-.row .nav>li>a:hover {
+/*.row ul{
+    padding:0;
+}*/
+TN-34230 .row .nav > li > a:hover {
   border-bottom-color: #555;
   background: none;
 }
 .row ul li:first-child {
   margin-left: 0;
 }
-.related-tabs .nav-tabs>li.active,
-.related-tabs .nav-tabs>li:hover,
-.related-tabs .nav-tabs>li.active:focus,
-.dashBoardContainer .nav-tabs>li.active,
-.dashBoardContainer .nav-tabs>li:hover,
-.dashBoardContainer .nav-tabs>li.active:focus,
-.contents.tabbable .nav-tabs>li.active,
-.contents.tabbable .nav-tabs>li:hover,
-.contents.tabbable .nav-tabs>li.active:focus {
+.related-tabs .nav-tabs > li.active,
+.dashBoardContainer .nav-tabs > li.active,
+.contents.tabbable .nav-tabs > li.active,
+.related-tabs .nav-tabs > li:hover,
+.dashBoardContainer .nav-tabs > li:hover,
+.contents.tabbable .nav-tabs > li:hover,
+.related-tabs .nav-tabs > li.active:focus,
+.dashBoardContainer .nav-tabs > li.active:focus,
+.contents.tabbable .nav-tabs > li.active:focus {
   border: none;
   border-bottom: 3px solid #555;
 }
-.nav-tabs>li.active>a,
-.nav-tabs>li.active>a:hover,
-.nav-tabs>li.active>a:focus,
-.nav-tabs>li>a {
+.nav-tabs > li.active > a,
+.nav-tabs > li.active > a:hover,
+.nav-tabs > li.active > a:focus,
+.nav-tabs > li > a {
   border: 0;
 }
-.nav>li>a:hover,
-.nav>li>a:focus {
+.nav > li > a:hover,
+.nav > li > a:focus {
   background-color: #FFFFFF;
 }
 .fa-pencil,
@@ -4908,6 +5076,9 @@ TN-34230
 .commentAttachmentName {
   font-size: 11px;
 }
+/******************************************* 
+********** Layout Editor ********
+********************************************/
 .marginBottom10px {
   margin-bottom: 10px;
 }
@@ -4930,6 +5101,7 @@ TN-34230
 }
 .zeroOpacity {
   opacity: 0;
+  /*for IE*/
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
   filter: alpha(opacity=0);
 }
@@ -4956,10 +5128,12 @@ TN-34230
 .layoutContent .opacity:hover .actions {
   opacity: 1;
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
+  /*for IE*/
   filter: alpha(opacity=100);
 }
 .layoutContent .fieldPropertyContainer:hover .actions {
   opacity: 1;
+  /*for IE*/
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
   filter: alpha(opacity=100);
 }
@@ -4982,6 +5156,7 @@ TN-34230
 .relatedTabModulesList .addButton {
   border-radius: 2px;
   border: 1px solid #DDDDDD;
+  text-transform: uppercase;
   color: #666666;
   background: #FFFFFF;
 }
@@ -5055,6 +5230,9 @@ TN-34230
   margin-left: 5px;
   word-break: break-all;
 }
+/******************************************* 
+************** Tax Management **************
+********************************************/
 #TaxCalculationsContainer .table tr:first-child,
 .taxModalContainer #editTax .table tr:first-child {
   border-bottom: 1px solid #ccc;
@@ -5094,6 +5272,9 @@ TN-34230
   max-height: 500px;
   overflow-y: auto;
 }
+/******************************************* 
+********** Workflows ********
+********************************************/
 #workflow_edit .editViewBody {
   overflow: inherit;
 }
@@ -5103,7 +5284,7 @@ TN-34230
 }
 .timePicker {
   width: 9.5em !important;
-  z-index: 1101 !important;
+  z-index: 1070 !important;
 }
 .weekDaySelect .ui-state-default {
   background: inherit;
@@ -5141,75 +5322,6 @@ TN-34230
 .module-filters.active {
   background: #F7F7F7;
 }
-.payment-type-selection {
-  margin-bottom: 30px;
-}
-.payment-type-selection img {
-  vertical-align: middle;
-}
-.currplan {
-  padding: 10px 20px;
-  background-color: #f3f3f3;
-  border: 1px solid #eee;
-  border-radius: 3px;
-}
-.currplan div {
-  display: inline-block;
-  font-size: 16px;
-}
-.planName {
-  display: inline-block;
-  color: #fff;
-  padding: 20px;
-  margin: 10px 20px;
-  font-size: 24px;
-  border-radius: 2px;
-}
-.plan-heading {
-  min-height: 168px;
-}
-.plan-title {
-  color: #fff;
-  font-size: 20px;
-  padding: 13px 0;
-}
-#sales_plan {
-  background: #3FC380;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#salespremium_plan {
-  background: #00B16A;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#support_plan {
-  background: #2980B9;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#supportpremium_plan {
-  background: #2980B9;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#ultimate_plan,
-#exclusive_plan {
-  background: #F39C12;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#contact_plan {
-  background: #FF5959;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
 .workflowListContainer .select2-container .select2-choice {
   height: 36px;
 }
@@ -5224,6 +5336,7 @@ TN-34230
 .contactAdd {
   border: 1px solid #eee;
   padding: 20px;
+  /*min-height: 310px !important;*/
 }
 #subDetails table td {
   padding: 7px 10px;
@@ -5346,9 +5459,9 @@ TN-34230
 .productBundles {
   padding-left: 20px;
 }
-.nav .open>a,
-.nav .open>a:hover,
-.nav .open>a:focus {
+.nav .open > a,
+.nav .open > a:hover,
+.nav .open > a:focus {
   color: #000000;
   background-color: #FFFFFF;
 }
@@ -5369,6 +5482,9 @@ TN-34230
   width: 100%;
   overflow-x: auto;
 }
+/******************************************* 
+*************** Mail Manager ***************
+********************************************/
 #mm_searchButton {
   height: 28px;
   background-color: #FFFFFF;
@@ -5424,8 +5540,8 @@ TN-34230
   padding: 1px 5px;
   border-radius: 3px;
   text-align: center;
-  text-shadow: 0 1px rgba(0,0,0,0.1);
-  background-image: -webkit-linear-gradient(top,#DD4B39 0,#D14836 100%);
+  text-shadow: 0 1px rgba(0, 0, 0, 0.1);
+  background-image: -webkit-linear-gradient(top, #DD4B39 0, #D14836 100%);
   border: 1px solid #C6322A;
   background-color: #DD4B39;
 }
@@ -5643,6 +5759,7 @@ TN-34230
 .width40per {
   width: 40%;
 }
+/****** Mail Manager Ends ******/
 .quickCreateContent .massEditTable textarea,
 .addCommentBlock .commentTextArea textarea {
   resize: vertical;
@@ -5655,19 +5772,20 @@ TN-34230
 .select2-container-multi .select2-choices {
   z-index: 1;
 }
-.nav .nav-stacks .cp-nav-header-wrapper>li.disabled>a:hover {
+/****** Customer Portal Settings ******/
+.nav .nav-stacks .cp-nav-header-wrapper > li.disabled > a:hover {
   background-color: #fff;
 }
-.cp-nav-header-wrapper>li.disabled>a:hover {
+.cp-nav-header-wrapper > li.disabled > a:hover {
   border: 0px ! important;
 }
-.nav .nav-stacks .cp-nav-header-wrapper>li.disabled>a {
+.nav .nav-stacks .cp-nav-header-wrapper > li.disabled > a {
   background-color: #fff;
 }
-#portalModulesTable>li.portalModuleRow.active>a:hover {
+#portalModulesTable > li.portalModuleRow.active > a:hover {
   background-color: #fff !important;
 }
-#portalModulesTable>li.portalModuleRow.active>a:focus {
+#portalModulesTable > li.portalModuleRow.active > a:focus {
   background-color: #fff !important;
 }
 .portal-dashboard {
@@ -5766,7 +5884,7 @@ TN-34230
 .portal-dashboard {
   border-bottom: 0px ! important;
 }
-#portal-shortcutsContainer>ul {
+#portal-shortcutsContainer > ul {
   border-bottom: 0px ! important;
 }
 .portalMenuHeader {
@@ -5775,14 +5893,15 @@ TN-34230
 }
 .cp-tabs .enabledModules {
   display: inline-block ! important;
-  margin-left: 4px !important;
-  margin-right: 4px !important;
+  margin-left: 4px!important;
+  margin-right: 4px!important;
   vertical-align: top;
   margin-top: 4px !important;
 }
 .portal-shortcut-list:hover {
   border-bottom: 3px solid transparent ! important;
 }
+/****** Customer Portal Settings ******/
 .label-radio label input[type="radio"] {
   position: relative;
   top: 2px;
@@ -5794,6 +5913,9 @@ TN-34230
 div.tooltip-inner {
   max-width: 400px;
 }
+/******************************************* 
+********** Menu Editor ********
+********************************************/
 .sortable.appContainer.ui-sortable {
   width: 160px;
 }
@@ -5968,7 +6090,7 @@ div.tooltip-inner {
   width: 13px !important;
   margin-top: 8px;
 }
-.detailview-table .input-group-addon+.inputElement.form-control,
+.detailview-table .input-group-addon + .inputElement.form-control,
 .detailview-table .inputElement.form-control.input-medium {
   width: 100%;
 }
@@ -6015,6 +6137,7 @@ div.tooltip-inner {
   float: left;
   margin-right: 5px;
 }
+/***** Oursites Changes *****/
 .portal-table .table-actions {
   width: inherit ! important;
 }
@@ -6026,6 +6149,7 @@ div.tooltip-inner {
   padding: 10px 5px ! important;
   padding-left: 10px ! important;
 }
+/***** Oursites Changes *****/
 .ExtensionscontentsDiv .content-area {
   padding-left: 15px;
   padding-right: 15px;
@@ -6039,14 +6163,14 @@ div.tooltip-inner {
 }
 .blockHeader {
   border-color: #F3F3F4 #F3F3F4 #cbcbcf;
-  border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
   background-color: #474747;
-  background-image: -moz-linear-gradient(top,#555555,#333333);
-  background-image: -ms-linear-gradient(top,#555555,#333333);
-  background-image: -webkit-gradient(linear,0 0,0 100%,from(#555555),to(#333333));
-  background-image: -webkit-linear-gradient(top,#555555,#333333);
-  background-image: -o-linear-gradient(top,#555555,#333333);
-  background-image: linear-gradient(top,#555555,#333333);
+  background-image: -moz-linear-gradient(top, #555555, #333333);
+  background-image: -ms-linear-gradient(top, #555555, #333333);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#333333));
+  background-image: -webkit-linear-gradient(top, #555555, #333333);
+  background-image: -o-linear-gradient(top, #555555, #333333);
+  background-image: linear-gradient(top, #555555, #333333);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#333333', GradientType=0);
   min-height: 30px;
@@ -6139,8 +6263,8 @@ div.tooltip-inner {
 .markStar .starredStatus {
   display: none;
 }
-.nav>li.addDashboardTab>a,
-.nav>li.addDashboardTab>a:hover {
+.nav > li.addDashboardTab > a,
+.nav > li.addDashboardTab > a:hover {
   padding: 10px 15px;
   background: inherit;
 }
@@ -6153,7 +6277,7 @@ div.tooltip-inner {
   height: 960px;
   width: 1260px;
 }
-.nav-tabs>li {
+.nav-tabs > li {
   border-bottom: 3px solid transparent;
   margin: 0 2px;
 }
@@ -6231,16 +6355,14 @@ div.tooltip-inner {
 }
 .select2-container.select2-container-multi.select2,
 .editViewPageDiv .select2-container.select2-container-multi.select2 {
-  height: auto !important;
+  height: auto!important;
 }
-.summaryViewFields .select2-container-multi.inputElement.form-control
-.quickCreateContent .select2-container.select2-container-multi.select2,
+.summaryViewFields .select2-container-multi.inputElement.form-control .quickCreateContent .select2-container.select2-container-multi.select2,
 #massEditContainer .select2-container.select2-container-multi.select2 {
   width: 150px;
   height: auto !important;
 }
-.summaryViewFields .select2-container-multi.inputElement.form-control
-.quickCreateContent .select2-container.select2-container-multi.select2 .input-save-wrap,
+.summaryViewFields .select2-container-multi.inputElement.form-control .quickCreateContent .select2-container.select2-container-multi.select2 .input-save-wrap,
 #massEditContainer .select2-container.select2-container-multi.select2 .input-save-wrap {
   float: right;
   margin-right: 25px;
@@ -6336,6 +6458,7 @@ a.cp-modules:hover {
 #RestrictionsLayout {
   background: #fafafb;
   margin-top: -92px;
+  /*to adjust with page padding top*/
 }
 #RestrictionsLayout .vtImage {
   width: 22%;
@@ -6369,6 +6492,7 @@ a.cp-modules:hover {
 .datepicker {
   z-index: 1100 !important;
 }
+/*****RSS Changes****/
 .feedListContainer .listview-table tr td:first-child,
 .listview-table tr th:first-child {
   width: inherit ! important;
@@ -6376,12 +6500,14 @@ a.cp-modules:hover {
 .feedListContainer .listViewEntries .listViewEntryValue {
   max-width: inherit ! important;
 }
-.ps-container>.ps-scrollbar-y-rail {
+/*****RSS Changes****/
+.ps-container > .ps-scrollbar-y-rail {
   z-index: 1002;
 }
 #relationBlock .recordScroll {
   max-height: 150px;
 }
+/*Start - List sidebar toggle*/
 .essentials-toggle {
   background-color: white;
   font-weight: bold;
@@ -6401,6 +6527,7 @@ a.cp-modules:hover {
 .essentials-toggle .fa-chevron-right {
   background-position: -460px -72px !important;
 }
+/*End - List essentials toggle*/
 .module-name-tooltip .qtip-content {
   font-size: 12px;
   padding: 3px;
@@ -6484,8 +6611,8 @@ li.select2-search-choice div {
 .popover ul.listmenu li {
   padding: 3px;
 }
-.popover-content .disabled>a,
-.popover .disabled>a {
+.popover-content .disabled > a,
+.popover .disabled > a {
   opacity: 0.5;
   cursor: not-allowed;
 }
@@ -6496,6 +6623,7 @@ li.select2-search-choice div {
   -o-transform: rotate(180deg);
   transform: rotate(180deg);
 }
+/*Start - List sidebar toggle*/
 .essentials-toggle {
   background-color: white;
   font-weight: bold;
@@ -6515,6 +6643,7 @@ li.select2-search-choice div {
 .essentials-toggle .fa-chevron-right {
   background-position: -460px -72px !important;
 }
+/*End - List essentials toggle*/
 .module-name-tooltip .qtip-content {
   font-size: 12px;
   padding: 3px;
@@ -6595,16 +6724,16 @@ li.select2-search-choice div {
 #reportDetails .pivot .toptitle.targetY0,
 #reportDetails .pivot .lefttitle.targetX0 {
   border-color: #F3F3F4 #F3F3F4 #cbcbcf;
-  border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
   background-color: #474747;
-  background-image: -moz-linear-gradient(top,#555555,#333333);
-  background-image: -ms-linear-gradient(top,#555555,#333333);
-  background-image: -webkit-gradient(linear,0 0,0 100%,from(#555555),to(#333333));
-  background-image: -webkit-linear-gradient(top,#555555,#333333);
-  background-image: -o-linear-gradient(top,#555555,#333333);
-  background-image: linear-gradient(top,#555555,#333333);
+  background-image: -moz-linear-gradient(top, #555555, #333333);
+  background-image: -ms-linear-gradient(top, #555555, #333333);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#333333));
+  background-image: -webkit-linear-gradient(top, #555555, #333333);
+  background-image: -o-linear-gradient(top, #555555, #333333);
+  background-image: linear-gradient(top, #555555, #333333);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555',endColorstr='#333333',GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#333333', GradientType=0);
   min-height: 30px;
 }
 #reportDetails .pivot th.toptitle.targetY0,
@@ -6646,7 +6775,8 @@ li.select2-search-choice div {
   background: #FFFFFF;
 }
 .templateActions {
-  background: rgba(0,0,0,0.1);
+  background: rgba(0, 0, 0, 0.1);
+  /*padding: 4%;*/
   bottom: 0;
   text-align: center;
   position: absolute;
@@ -6654,6 +6784,9 @@ li.select2-search-choice div {
   zoom: 1;
   width: 100%;
 }
+/*.templateActions i {
+    margin-right: 30px;
+}*/
 .thumbnails > li {
   float: left;
   height: 315px !important;
@@ -6828,9 +6961,10 @@ a.btnReport:hover {
   left: 0px;
 }
 .bx-wrapper .bx-viewport {
-  width:99%;
+  width: 99%;
   left: 0px;
   background: #fff;
+  /*fix other elements on the page moving (on Chrome)*/
   -webkit-transform: translatez(0);
   -moz-transform: translatez(0);
   -ms-transform: translatez(0);
@@ -6888,7 +7022,7 @@ a.btnReport:hover {
 .filter-search-show {
   display: block !important;
 }
-.emailTemplatesPopupTableContainer .listViewEntries  .listViewEntryValue {
+.emailTemplatesPopupTableContainer .listViewEntries .listViewEntryValue {
   max-width: 100%;
   min-width: 150px;
 }
@@ -6923,12 +7057,15 @@ input:focus::-webkit-input-placeholder {
 input:focus:-moz-placeholder {
   color: transparent;
 }
+/* FF 4-18 */
 input:focus::-moz-placeholder {
   color: transparent;
 }
+/* FF 19+ */
 input:focus:-ms-input-placeholder {
   color: transparent;
 }
+/* IE 10+ */
 .global-actions .dropdown-menu:before {
   position: absolute;
   top: -7px;
@@ -6937,7 +7074,7 @@ input:focus:-ms-input-placeholder {
   border-right: 7px solid transparent;
   border-bottom: 7px solid #ccc;
   border-left: 7px solid transparent;
-  border-bottom-color: rgba(0,0,0,0.2);
+  border-bottom-color: rgba(0, 0, 0, 0.2);
   content: '';
 }
 .global-actions .dropdown-menu:after {
@@ -7122,6 +7259,7 @@ input:focus:-ms-input-placeholder {
   text-align: center;
 }
 #OnBoardLayout #OnBoardPageContainer .crmGoals textarea::-webkit-input-placeholder {
+  /* WebKit browsers */
   text-align: center;
   padding: 20%;
   font-size: 12px;
@@ -7267,121 +7405,3 @@ input:focus:-ms-input-placeholder {
   border-left: 3px solid #3CB878;
   opacity: 1;
 }
-.fieldValue .value a {
-  color: #15c !important;
-}
-.editViewContents .fieldLabel {
-  min-width: 100px;
-  width: 20%;
-  word-break: break-all;
-}
-.editViewContents .fieldValue {
-  width:30%;
-}
-.editViewContents td.fieldValue[colspan="3"] {
-  width:80%;
-}
-.editViewContents textarea.textAreaElement {
-  width: 88%;
-}
-.editViewContents input[type="checkbox"] {
-  width: 15px;
-  height: 15px;
-}
-.editViewContents input[type="radio"] {
-  width: 15px;
-  height: 15px;
-}
-#composeEmailContainer .modal-body .quickCreateContent,
-#QuickCreate .modal-body .quickCreateContent,
-#create .quickCreateContent {
-  margin-top: 25px;
-}
-.settingsgroup-panel .widgetContainer .menuItemLabel .pinUnpinShortCut {
-  display: none;
-  margin-top: 2px;
-}
-.settingsgroup-panel .widgetContainer .menuItemLabel:hover .pinUnpinShortCut {
-  display: inline-block;
-}
-@-moz-document url-prefix() {
-  .duplicateHandlingContainer .tooltip-inner {
-    width: 550px;
-    max-width: 550px;
-  }
-}
-.duplicateHandlingContainer .tooltip-inner {
-  text-align: left !important;
-}
-.duplicateHandlingContainer .syncMessage {
-  margin-top: 5px !important;
-}
-.duplicateHandlingContainer .actionsList {
-  width: 230px !important;
-}
-.duplicationMessageContainer {
-  background-color: #f2dede !important;
-  color: #b94a48 !important;
-}
-.duplicationMessageContainer .duplicationMessageHeader {
-  margin-bottom: 8px;
-}
-.listViewRecordActions .quickView, .listViewRecordActions .markStar,
-.listViewRecordActions .markAsHeld,.listViewRecordActions .holdFollowupOn {
-  margin-top: 4px;
-}
-.app-menu .module-icon .custom-module {
-	font-size: 14px;
-	border-radius: 4px;
-	color: #000;
-	background-color: #fff;
-	padding: 4px 10px 4px 5px !important
-}
-.menu-item .custom-module {
-	font-family: 'OpenSans-Regular', sans-serif;
-	font-size: 12px;
-	border-radius: 4px;
-	padding: 2px;
-	color: #000;
-	background-color: #fff;
-}
-.modules-menu .custom-module {
-	color: #fff;
-	margin-left: 0px;
-	display: inline;
-	border: 1px solid #fff;
-	border-radius: 4px;
-	padding: 3px 4px 3px 2px !important;
-	font-weight: bold;
-}
-#quickCreateModules .custom-module, .workflowListContainer .custom-module, .dashBoardTabContents .custom-module {
-	border-radius: 4px;
-	padding: 3px 5px;
-	color: #fff;
-	background-color: #777;
-}
-.menuEditorItem .custom-module {
-	border-radius: 4px;
-	padding: 3px 5px;
-	color: #000;
-	background-color: #fff;
-}
-.task-details .custom-module {
-	border-radius: 4px;
-	padding: 1px 4px;
-	color: white;
-	background-color: #777;
-}
-.related-tabs .custom-module, #relatedmenuList .custom-module {
-	border-radius: 4px;
-	color: #fff;
-	background-color: #777;
-	padding: 5px 7px;
-	font-weight: bold;
-}
-.record-header .custom-module {
-	font-size: 30px;
-}
-.moduleIcon .custom-module {
-	font-weight: bold;
-}
diff --git a/layouts/v7/skins/project/style.css b/layouts/v7/skins/project/style.css
index 489bd72173fc038b8895297ae4f1ed5ebfa16e66..73aab69fe92fa767548aaf0832b4d5998593d708 100644
--- a/layouts/v7/skins/project/style.css
+++ b/layouts/v7/skins/project/style.css
@@ -1,7 +1,9 @@
 @font-face {
   font-family: 'Oswald';
   src: url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.eot');
-  src: url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.eot?#iefix') format('embedded-opentype'), url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.woff') format('woff'), url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.ttf') format('truetype'), url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.svg#Oswald') format('svg');
+  /* IE9 Compat Modes */
+  src: url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.svg#Oswald') format('svg');
+  /* Legacy iOS */
   font-weight: normal;
   font-style: normal;
   text-rendering: optimizeLegibility;
@@ -15,27 +17,37 @@ a:active {
 @font-face {
   font-family: 'OpenSans-Regular';
   src: url('../fonts/OpenSans/Regular/OpenSans-Regular.eot');
-  src: url('../fonts/OpenSans/Regular/OpenSans-Regular.ttf') format('truetype'), url('../fonts/OpenSans/Regular/OpenSans-Regular.eot?#iefix') format('embedded-opentype'), url('../fonts/OpenSans/Regular/OpenSans-Regular.woff2') format('woff2'), url('../fonts/OpenSans/Regular/OpenSans-Regular.woff') format('woff'), url('../fonts/OpenSans/Regular/OpenSans-Regular.svg#svgFontName') format('svg');
+  /* IE9 Compat Modes */
+  src: url('../fonts/OpenSans/Regular/OpenSans-Regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/OpenSans/Regular/OpenSans-Regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/OpenSans/Regular/OpenSans-Regular.woff2') format('woff2'), /* Super Modern Browsers */ url('../fonts/OpenSans/Regular/OpenSans-Regular.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/OpenSans/Regular/OpenSans-Regular.svg#svgFontName') format('svg');
+  /* Legacy iOS */
 }
 @font-face {
   font-family: 'OpenSans-Semibold';
   src: url('../fonts/OpenSans/Semibold/OpenSans-Semibold.eot');
-  src: url('../fonts/OpenSans/Semibold/OpenSans-Semibold.ttf') format('truetype'), url('../fonts/OpenSans/Semibold/OpenSans-Semibold.eot?#iefix') format('embedded-opentype'), url('../fonts/OpenSans/Semibold/OpenSans-Semibold.woff2') format('woff2'), url('../fonts/OpenSans/Semibold/OpenSans-Semibold.woff') format('woff'), url('../fonts/OpenSans/Semibold/OpenSans-Semibold.svg#svgFontName') format('svg');
+  /* IE9 Compat Modes */
+  src: url('../fonts/OpenSans/Semibold/OpenSans-Semibold.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/OpenSans/Semibold/OpenSans-Semibold.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/OpenSans/Semibold/OpenSans-Semibold.woff2') format('woff2'), /* Super Modern Browsers */ url('../fonts/OpenSans/Semibold/OpenSans-Semibold.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/OpenSans/Semibold/OpenSans-Semibold.svg#svgFontName') format('svg');
+  /* Legacy iOS */
 }
 @font-face {
   font-family: 'ProximaNova-Regular';
-  src: url('../fonts/ProximanovaWebfont/ProximaNova-Regular.ttf') format('truetype'), url('../fonts/ProximanovaWebfont/ProximaNova-Regular.woff') format('woff'), url('../fonts/ProximanovaWebfont/ProximaNova-Regular.eot?#iefix') format('embedded-opentype');
+  src: url('../fonts/ProximanovaWebfont/ProximaNova-Regular.ttf') format('truetype'), url('../fonts/ProximanovaWebfont/ProximaNova-Regular.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/ProximanovaWebfont/ProximaNova-Regular.eot?#iefix') format('embedded-opentype');
+  /* IE6-IE8 */
+  /* Safari, Android, iOS */
   font-style: normal;
   font-weight: normal;
   text-rendering: optimizeLegibility;
 }
 @font-face {
   font-family: 'ProximaNova-Semibold';
-  src: url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.ttf') format('truetype'), url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.woff') format('woff'), url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.eot?#iefix') format('embedded-opentype');
+  src: url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.eot?#iefix') format('embedded-opentype');
+  /* IE6-IE8 */
   font-style: normal;
   font-weight: normal;
   text-rendering: optimizeLegibility;
 }
+/**********************************/
+/************ Layout **************/
+/**********************************/
 html {
   height: 100%;
   overflow-y: auto;
@@ -102,6 +114,7 @@ body {
 @media (min-width: 992px) {
   .global-nav .logo-container {
     display: inline-block;
+    width: 150px;
     z-index: 2;
     padding-left: 6%;
     margin-top: 1px;
@@ -113,11 +126,13 @@ body {
     position: absolute;
     width: 100%;
     height: 42px;
+    /*        border-top:1px solid #ddd;*/
     border-bottom: 1px solid #ddd;
   }
   .app-nav .module-action-bar .module-action-content {
     background: #FBFBFB;
     height: 41px;
+    /*        border-bottom: 1px solid #eee;*/
   }
   .app-nav .module-action-bar .module-action-content .navbar-right {
     margin-right: 0;
@@ -163,7 +178,7 @@ body {
     padding-left: 0;
   }
 }
-.btn-toolbar >.btn-group:first-child {
+.btn-toolbar > .btn-group:first-child {
   margin-left: 5px;
 }
 .vt-notification {
@@ -196,15 +211,19 @@ body {
 .vt-notification [data-notify="message"] {
   color: #eaeaea;
 }
+/**********************************/
+/******** Navigation styles *******/
+/**********************************/
 .company-logo {
   height: 40px;
+  width: 150px;
   margin: 0 0;
   display: inline-block;
   margin-left: 1px;
 }
 .company-logo img {
-  max-height: 100%;
-  max-width: 100%;
+  height: 100%;
+  width: auto;
 }
 .navbar .fa {
   font-size: 15px;
@@ -214,10 +233,13 @@ body {
   font-size: 16px;
   position: relative;
 }
+/*.module-action-bar .module-action-content #appnav{
+    padding-top:5px;
+}*/
 .global-nav .navbar-nav > li div a {
   padding: 15px;
 }
-.global-nav>ul {
+.global-nav > ul {
   margin-right: 20px;
 }
 .global-nav .search-links-container {
@@ -267,26 +289,28 @@ body {
     float: right;
     height: 42px;
   }
-  .module-action-bar .navbar-right .nav>li {
+  .module-action-bar .navbar-right .nav > li {
     display: inline-block;
   }
-  .module-action-bar .navbar-right .nav>li a {
+  .module-action-bar .navbar-right .nav > li a {
     padding: 0 10px;
   }
   .global-nav .logo-container {
     border-bottom: 0;
+    width: 150px;
   }
 }
 @media (max-width: 991px) {
   .global-nav .logo-container {
     border-bottom: 0;
+    width: 150px;
   }
   .notificationMessageHolder {
     padding-left: 45%;
   }
 }
 @media (min-width: 991px) {
-  .nav>li>a.qc-button {
+  .nav > li > a.qc-button {
     padding: 2px 3px;
     margin-top: 13px;
     margin-right: 15px;
@@ -294,7 +318,7 @@ body {
     color: #fff;
     border-radius: 20px;
   }
-  .nav>li>a.qc-button span {
+  .nav > li > a.qc-button span {
     vertical-align: top;
   }
 }
@@ -313,6 +337,7 @@ body {
   width: 100%;
   height: 100%;
 }
+/** App Nav Styles */
 .active-app-title {
   white-space: nowrap;
   font-family: Oswald, "OpenSans-Semibold", "Helvetica Neue", Helvetica, sans-serif;
@@ -367,7 +392,9 @@ body {
   height: 42px;
   text-align: center;
   line-height: 42px;
+  /*    background-color: #2c3b49;*/
   color: #ffffff;
+  /*border-bottom: 1px solid #272B46;*/
 }
 .app-nav .app-indicator-icon-container .app-indicator-icon {
   font-size: 24px;
@@ -479,16 +506,16 @@ body {
   right: -4px;
 }
 #overlayPageContent .mCSB_scrollTools,
-#overlayPageContent .mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar,
-#overlayPageContent .mCSB_scrollTools .mCSB_buttonUp,
-#overlayPageContent .mCSB_scrollTools .mCSB_buttonDown,
-#overlayPageContent .mCSB_scrollTools .mCSB_buttonLeft,
-#overlayPageContent .mCSB_scrollTools .mCSB_buttonRight,
 .app-list .mCSB_scrollTools,
+#overlayPageContent .mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar,
 .app-list .mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar,
+#overlayPageContent .mCSB_scrollTools .mCSB_buttonUp,
 .app-list .mCSB_scrollTools .mCSB_buttonUp,
+#overlayPageContent .mCSB_scrollTools .mCSB_buttonDown,
 .app-list .mCSB_scrollTools .mCSB_buttonDown,
+#overlayPageContent .mCSB_scrollTools .mCSB_buttonLeft,
 .app-list .mCSB_scrollTools .mCSB_buttonLeft,
+#overlayPageContent .mCSB_scrollTools .mCSB_buttonRight,
 .app-list .mCSB_scrollTools .mCSB_buttonRight {
   -webkit-transition: none;
   transition: none;
@@ -700,6 +727,7 @@ a.menu-item:hover {
   width: 0px;
   overflow: hidden;
 }
+/* User Logout */
 .logout-content {
   padding: 10px;
   width: 350px;
@@ -754,6 +782,9 @@ a.menu-item:hover {
 .app-settings {
   background: #FFFFFF;
 }
+/*************************************************/
+/******** View styles (List/Edit/Detail..) *******/
+/*************************************************/
 .viewContent .content-area {
   padding-left: 50px;
 }
@@ -791,7 +822,6 @@ a.menu-item:hover {
 .fieldValue .value {
   max-width: 85%;
   display: inline-block;
-  word-break: break-word;
 }
 .modal-header button.close {
   padding: 0;
@@ -865,6 +895,9 @@ input[type="password"].inputElement {
   padding-right: 20px;
   padding-left: 20px;
 }
+/**********************************/
+/**** Side vertical Nav styles ****/
+/**********************************/
 .module-nav {
   background: #fff;
   z-index: 1004;
@@ -880,6 +913,9 @@ input[type="password"].inputElement {
   left: 0;
   transition: 0s width;
 }
+.module-nav:hover {
+  /*z-index: 1001;*/
+}
 .modules-menu ul {
   list-style: none;
   margin-left: 0;
@@ -914,7 +950,7 @@ input[type="password"].inputElement {
   float: left;
   font-size: 20px;
 }
-.modules-menu ul li a>span {
+.modules-menu ul li a > span {
   margin-left: 10px;
   vertical-align: middle;
   font-size: 13px;
@@ -954,6 +990,7 @@ input[type="password"].inputElement {
   width: 100%;
   left: 0%;
 }
+/** Lists Menu in Side bar */
 .module-filters .settings-sidebar,
 .module-filters .sidebar-container {
   padding: 0 12px;
@@ -987,6 +1024,7 @@ input[type="password"].inputElement {
 .lists-menu-container hr {
   margin: 5px 0;
 }
+/* mScrollbar customization for lists widget */
 .lists-menu-container .menu-scroller .mCSB_scrollTools {
   width: 13px;
 }
@@ -998,8 +1036,10 @@ input[type="password"].inputElement {
 .modules-menu .mCSB_scrollTools .mCSB_draggerContainer {
   left: 8px;
 }
+/* Customization ends */
 .lists-menu-container .list-menu-content .more-less-link {
   color: #fff;
+  /*text-decoration: none;*/
 }
 .lists-menu-container .list-menu-content .sub-header {
   color: #ddd;
@@ -1104,9 +1144,11 @@ input[type="password"].inputElement {
 .common-links-container > div a {
   color: #fff;
 }
+/*Search Container styles */
 .search-container {
   min-height: 300px;
   position: absolute;
+  /*z-index: 1030;*/
   width: 100%;
   top: 0;
   background: #FBFBFB;
@@ -1125,6 +1167,7 @@ input[type="password"].inputElement {
 .footer p {
   margin: 5px 0;
 }
+/*** Utilities ***/
 .showElement {
   display: block !important;
   height: 100%;
@@ -1247,11 +1290,11 @@ ul.unstyled {
 }
 .emptyRecordsDiv .emptyRecordsContent {
   display: inline-block;
-  font-size: 16px;
   left: 50%;
   margin-left: -25%;
   position: absolute;
   width: 50%;
+  font-size: 16px;
 }
 .textOverflowEllipsis {
   overflow: hidden;
@@ -1276,6 +1319,9 @@ ul.unstyled {
 .removeNoFileChosen {
   color: transparent !important;
 }
+/***********************************
+**********Button Styles**********
+***********************************/
 .module-buttons-container {
   float: right;
   margin-right: 10px;
@@ -1297,6 +1343,7 @@ ul.unstyled {
   margin: 4px 2px;
   border-radius: 2px;
   border: 1px solid #ddd;
+  text-transform: uppercase;
   color: #666;
   background: #fff;
 }
@@ -1317,6 +1364,9 @@ ul.unstyled {
   color: #FFFFFF !important;
   background: #5bc0de !important;
 }
+/***********************************
+**********List View Styles**********
+***********************************/
 .fa.pull-left {
   margin-right: 0;
 }
@@ -1351,7 +1401,7 @@ ul.unstyled {
   font-size: 20px;
 }
 .listview-pagination .disabled {
-  color: rgba(0,0,0,0.2);
+  color: rgba(0, 0, 0, 0.2);
 }
 .listview-pagination .disabled:hover {
   cursor: default;
@@ -1379,6 +1429,8 @@ ul.unstyled {
 .listview-table {
   margin-bottom: 0;
   border-top: 0;
+  /* Horizontal scroll will not work if table layout Fixed */
+  /*    table-layout: fixed;*/
 }
 .listview-table tr td,
 .listview-table tr th {
@@ -1408,7 +1460,7 @@ ul.unstyled {
   width: 100%;
 }
 .listViewEntries .relatedListEntryValues .fieldValue .value,
-.listViewEntries  .listViewEntryValue .fieldValue .value {
+.listViewEntries .listViewEntryValue .fieldValue .value {
   vertical-align: middle;
   width: 100%;
   display: inline-block;
@@ -1423,7 +1475,7 @@ ul.unstyled {
 }
 .listview-table-norecords .table-actions,
 .listview-table .table-actions {
-  width: 120px;
+  width: 110px;
   font-size: 15px;
   color: #555;
   margin-left: 7px;
@@ -1489,13 +1541,13 @@ input[type=checkbox]:checked {
   vertical-align: middle;
   display: table-cell;
 }
-.listview-table  tr.searchRow th {
+.listview-table tr.searchRow th {
   padding: 5px 3px;
 }
-.listview-table  tr.searchRow th.inline-search-btn {
+.listview-table tr.searchRow th.inline-search-btn {
   padding: 3px 10px;
 }
-.listview-table  tr.searchRow th.inline-search-btn button {
+.listview-table tr.searchRow th.inline-search-btn button {
   text-align: center;
   width: 85%;
   text-shadow: none;
@@ -1523,6 +1575,18 @@ input[type=checkbox]:checked {
   background-color: #FFEEEE !important;
   background-image: none !important;
 }
+/*.floatThead-wrapper .table-container{
+    z-index: 0 !important;
+}*/
+/* List view bottom fixed scroll */
+/*.bottom-fixed-scroll{
+    height: 14px;
+    position: relative;
+    top: -15px;
+    overflow-x: auto;
+    overflow-y: hidden;
+    width: 100%;
+}*/
 .scroller-div {
   height: 1px;
 }
@@ -1644,12 +1708,12 @@ input[type=checkbox]:checked {
 #listColumnFilterContainer .disabled i {
   color: #ccc;
 }
+/**********************************
+**********Detail View Styles**********
+**********************************/
 .detailViewButtoncontainer {
   padding-top: 5px;
 }
-.detailViewButtoncontainer button.btn {
-  margin: 0px 1px !important;
-}
 .detailview-header .recordBasicInfo > .info-row {
   margin-bottom: 4px;
 }
@@ -1730,9 +1794,6 @@ th {
   margin-top: 3%;
   margin-right: 2%;
 }
-.overlayDetailHeader button.btn {
-  margin: 0px 1px !important;
-}
 .referencefield-wrapper .createReferenceRecord {
   float: left;
   margin-left: 5px;
@@ -1972,10 +2033,10 @@ th {
   z-index: 1030;
 }
 .overlay-container-60 {
-  margin-left: 42px;
+  margin-left: 42px ;
 }
 .overlay-container-300 {
-  margin-left: 230px;
+  margin-left: 230px ;
 }
 .overlayPageContent {
   background: #FFFFFF;
@@ -2098,6 +2159,9 @@ th {
   height: 26px;
   line-height: 25px;
 }
+/**********************************
+**********Summary View Styles******
+**********************************/
 .summary-table {
   width: 100%;
   table-layout: fixed;
@@ -2218,33 +2282,33 @@ th {
   opacity: 1;
   cursor: pointer;
 }
-.details.row >form .social-media-toggle {
+.details.row > form .social-media-toggle {
   position: absolute;
   right: -15px;
   display: inline-block;
   width: 500px;
   border-left: 0px;
 }
-.details.row >form .social-media-widget {
+.details.row > form .social-media-widget {
   border-left: 1px solid #ddd;
   border-bottom: 1px solid #ddd;
   height: 100%;
   background: white;
 }
-.details.row >form div[class*="col-"].resizable-summary-view {
+.details.row > form div[class*="col-"].resizable-summary-view {
   padding-left: 0;
   padding-right: 0px;
 }
-.details.row >form>div[class*="col-"],
-.details.row >form .resizable-summary-view div[class*="col-"] {
+.details.row > form > div[class*="col-"],
+.details.row > form .resizable-summary-view div[class*="col-"] {
   padding-right: 0;
   padding: 0px 5px;
 }
-.details.row >form>div[class*="col-"]:first-child,
-.details.row >form .left-block {
+.details.row > form > div[class*="col-"]:first-child,
+.details.row > form .left-block {
   padding-left: 0 !important;
 }
-.details.row >form>div[class*="col-"]:last-child {
+.details.row > form > div[class*="col-"]:last-child {
   padding-right: 0;
 }
 .summaryWidgetContainer .noContent {
@@ -2257,6 +2321,9 @@ th {
 .caseReplyArea .nav > li {
   padding: 0 10px;
 }
+/**********************************
+**********Edit View Styles*******
+**********************************/
 .main-container .editViewModNavigator.module-nav,
 .editViewModNavigator .mod-switcher-container,
 .editViewModNavigator .modules-menu {
@@ -2297,7 +2364,7 @@ th {
   width: 100%;
 }
 .editViewContents .input-group {
-  width: 229px;
+  width: 208px;
   float: left;
 }
 .input-group.inputElement .input-group-addon {
@@ -2376,6 +2443,9 @@ th {
   z-index: 1000;
   padding: 7px;
 }
+/**********************************
+**********Advance Search styles**********
+**********************************/
 .op0.fadeInx {
   opacity: 1;
 }
@@ -2448,7 +2518,11 @@ th {
 }
 .btn + input {
   margin-left: 5px;
+  /*    margin-top : 3px;*/
 }
+/**********************************
+**********Extension Store Styles**********
+**********************************/
 .extensionstore .app-trigger {
   width: 98%;
 }
@@ -2479,6 +2553,9 @@ th {
 .extensionContents .extensionError {
   color: #F10404;
 }
+/**********************************
+**********Extension Store Nav Bar**********
+**********************************/
 .tabbable-line > .nav-tabs {
   border: none;
   margin: 0px;
@@ -2547,6 +2624,9 @@ th {
 .extensionContents .listview-table {
   width: 100%;
 }
+/*******************************************
+******Detail View related list styles*******
+********************************************/
 .relatedContents .listViewContentHeaderValues:hover {
   text-decoration: none;
   color: #333;
@@ -2604,6 +2684,9 @@ th {
 .relatedViewActions .btn-group {
   margin-right: 15px;
 }
+/*******************************************
+****************** Modal *******************
+********************************************/
 .modal-header {
   padding: 5px 15px;
   background: #596875;
@@ -2631,6 +2714,7 @@ th {
   width: 100%;
   float: left;
   background: #596875;
+  /*    height: 100%;*/
 }
 .settings-menu {
   display: inline-block;
@@ -2647,7 +2731,7 @@ th {
   cursor: n-resize;
 }
 .settings-menu-items {
-  box-shadow: 0 1px 1px rgba(0,0,0,0.05);
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
   margin-bottom: 10px;
   text-align: justify;
 }
@@ -2765,9 +2849,6 @@ th {
 .active .stepNum {
   color: #FFFFFF;
 }
-.mailBoxEditDiv .crumbs li {
-  width: 22%;
-}
 .stepNum {
   display: inline-block;
   padding: 0 5px;
@@ -2776,6 +2857,7 @@ th {
   vertical-align: middle;
   color: #3399ff;
 }
+/* .squaredFour */
 .squaredFour {
   width: 20px;
   position: relative;
@@ -2789,9 +2871,9 @@ th {
   top: 0;
   left: 0;
   background: #fcfff4;
-  background: linear-gradient(top,#fcfff4 0%,#dfe5d7 40%,#b3bead 100%);
+  background: linear-gradient(top, #fcfff4 0%, #dfe5d7 40%, #b3bead 100%);
   border-radius: 4px;
-  box-shadow: inset 0px 1px 1px white, 0px 1px 3px rgba(0,0,0,0.5);
+  box-shadow: inset 0px 1px 1px white, 0px 1px 3px rgba(0, 0, 0, 0.5);
 }
 .squaredFour label:after {
   content: '';
@@ -2819,13 +2901,16 @@ th {
 .importBlockContainer {
   color: #596875;
 }
+/******************************************* 
+************* Social Buttons *************** 
+********************************************/
 .btn-block + .btn-block {
   margin-top: 5px;
 }
 .btn-google-plus {
   color: #FFFFFF !important;
   background-color: #DD4B39;
-  border-color: rgba(0,0,0,0.2);
+  border-color: rgba(0, 0, 0, 0.2);
 }
 .btn-social {
   position: relative;
@@ -2844,15 +2929,18 @@ th {
   line-height: 34px;
   font-size: 1.6em;
   text-align: center;
-  border-right: 1px solid rgba(0,0,0,0.2);
+  border-right: 1px solid rgba(0, 0, 0, 0.2);
 }
+/******************************************* 
+************* Updates Timeline *************** 
+********************************************/
 .recentActivitiesContainer .history {
   margin: 0 auto;
   padding: 20px 20px 1px;
   max-width: 100%;
   overflow-x: visible;
-  -webkit-transition: opacity .2s ease-out;
-  transition: opacity .2s ease-out;
+  -webkit-transition: opacity 0.2s ease-out;
+  transition: opacity 0.2s ease-out;
 }
 .updates_timeline {
   padding-top: 20px;
@@ -2861,6 +2949,7 @@ th {
   padding: 0;
   list-style: none;
 }
+/* The line */
 .updates_timeline:before {
   content: '';
   position: absolute;
@@ -2879,6 +2968,7 @@ th {
   min-height: 40px;
   z-index: 2;
 }
+/* Left Content(Time) */
 .updates_timeline > li .update_time {
   position: absolute;
   margin: 0;
@@ -2890,6 +2980,7 @@ th {
   font-size: 15px;
   font-style: italic;
 }
+/* Right content(Update info) */
 .updates_timeline > li .update_info {
   padding: 10px 10px 1px;
   display: block;
@@ -2898,10 +2989,11 @@ th {
   position: relative;
   top: -45px;
 }
-.updates_timeline > li .update_info >h3 {
+.updates_timeline > li .update_info > h3 {
   font-size: 1.1em;
   margin-left: -3%;
 }
+/* The icons  */
 .updates_timeline > li .update_icon {
   position: relative;
   border-radius: 50%;
@@ -2914,6 +3006,7 @@ th {
   color: #fff;
   line-height: 35px;
 }
+/* More Button */
 .updates_timeline #more_button .update_icon {
   position: relative;
   border-radius: 0;
@@ -3021,6 +3114,9 @@ th {
   vertical-align: super;
   font-size: 13px;
 }
+/******************************************* 
+************* Task Management ************** 
+********************************************/
 #taskManagementContainer .data-body {
   margin-bottom: 50px;
 }
@@ -3083,15 +3179,16 @@ th {
 #taskManagementContainer .other-details {
   color: #979797;
 }
+/*overwriting jquery ui css*/
 .ui-menu {
   z-index: 10000;
 }
 #taskManagementContainer button.active {
   background: #3B83F7;
   color: white;
-  text-shadow: 0 1px rgba(0,0,0,0.3);
+  text-shadow: 0 1px rgba(0, 0, 0, 0.3);
   border: 1px solid #135fd7;
-  box-shadow: inset 0 1px 2px rgba(0,0,0,0.3);
+  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.3);
 }
 .taskSubject {
   width: 99%;
@@ -3099,6 +3196,9 @@ th {
 #taskManagementContainer .mCustomScrollbar .mCSB_inside > .mCSB_container {
   margin-right: 13px;
 }
+/******************************************* 
+************* Settings Page ************** 
+********************************************/
 .settingsPageDiv.content-area {
   margin-right: 0;
 }
@@ -3132,6 +3232,9 @@ th {
 .settingsgroup-accordion a i {
   margin-right: 5px;
 }
+.settingsgroup-accordion a span {
+  text-transform: uppercase;
+}
 .settingsgroup {
   background: #2C3B49;
   height: 100%;
@@ -3288,35 +3391,59 @@ th {
 }
 .mini-slider-control[data-value="0"] .ui-slider-handle {
   background: #7d7e7d;
-  background: -moz-linear-gradient(top,#7d7e7d 0%,#0e0e0e 100%);
-  background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#7d7e7d),color-stop(100%,#0e0e0e));
-  background: -webkit-linear-gradient(top,#7d7e7d 0%,#0e0e0e 100%);
-  background: -o-linear-gradient(top,#7d7e7d 0%,#0e0e0e 100%);
-  background: -ms-linear-gradient(top,#7d7e7d 0%,#0e0e0e 100%);
-  background: linear-gradient(to bottom,#7d7e7d 0%,#0e0e0e 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#7d7e7d',endColorstr='#0e0e0e',GradientType=0);
+  /* Old browsers */
+  background: -moz-linear-gradient(top, #7d7e7d 0%, #0e0e0e 100%);
+  /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #7d7e7d), color-stop(100%, #0e0e0e));
+  /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #7d7e7d 0%, #0e0e0e 100%);
+  /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top, #7d7e7d 0%, #0e0e0e 100%);
+  /* Opera 11.10+ */
+  background: -ms-linear-gradient(top, #7d7e7d 0%, #0e0e0e 100%);
+  /* IE10+ */
+  background: linear-gradient(to bottom, #7d7e7d 0%, #0e0e0e 100%);
+  /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#7d7e7d', endColorstr='#0e0e0e', GradientType=0);
+  /* IE6-9 */
   margin-left: 0px;
 }
 .mini-slider-control[data-value="1"] .ui-slider-handle {
   background: #ffb76b;
-  background: -moz-linear-gradient(top,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#ffb76b),color-stop(0%,#ffa73d),color-stop(49%,#ff7c00),color-stop(100%,#ff7f04));
-  background: -webkit-linear-gradient(top,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  background: -o-linear-gradient(top,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  background: -ms-linear-gradient(top,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  background: linear-gradient(to bottom,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffb76b',endColorstr='#ff7f04',GradientType=0);
+  /* Old browsers */
+  background: -moz-linear-gradient(top, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffb76b), color-stop(0%, #ffa73d), color-stop(49%, #ff7c00), color-stop(100%, #ff7f04));
+  /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* Opera 11.10+ */
+  background: -ms-linear-gradient(top, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* IE10+ */
+  background: linear-gradient(to bottom, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffb76b', endColorstr='#ff7f04', GradientType=0);
+  /* IE6-9 */
   margin-left: -6px;
 }
 .mini-slider-control[data-value="2"] .ui-slider-handle {
   background: #bfd255;
-  background: -moz-linear-gradient(top,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#bfd255),color-stop(79%,#8eb92a),color-stop(100%,#72aa00),color-stop(100%,#9ecb2d));
-  background: -webkit-linear-gradient(top,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  background: -o-linear-gradient(top,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  background: -ms-linear-gradient(top,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  background: linear-gradient(to bottom,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bfd255',endColorstr='#9ecb2d',GradientType=0);
+  /* Old browsers */
+  background: -moz-linear-gradient(top, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #bfd255), color-stop(79%, #8eb92a), color-stop(100%, #72aa00), color-stop(100%, #9ecb2d));
+  /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* Opera 11.10+ */
+  background: -ms-linear-gradient(top, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* IE10+ */
+  background: linear-gradient(to bottom, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bfd255', endColorstr='#9ecb2d', GradientType=0);
+  /* IE6-9 */
   margin-left: -13px;
 }
 .ModulemanagerSettings .moduleblock .hiden {
@@ -3341,10 +3468,13 @@ th {
 th {
   padding: 6px;
 }
+/******************************************* 
+********** CustomerPortal styles start ********
+********************************************/
 .cp-tabs .enabledModules {
   display: inline-block ! important;
-  margin-left: 4px !important;
-  margin-right: 4px !important;
+  margin-left: 4px!important;
+  margin-right: 4px!important;
   vertical-align: top;
 }
 .drag-portal-module {
@@ -3451,7 +3581,7 @@ th {
   margin-left: 5px;
 }
 .portal-field-delete {
-  margin-left: 45px !important;
+  margin-left: 45px!important;
 }
 .portalModuleRow {
   border-left: 4px solid #8E44AD !important;
@@ -3468,7 +3598,7 @@ th {
   content: "*";
   color: red;
 }
-.nav-tabs .cp-modules > .active >a,
+.nav-tabs .cp-modules > .active > a,
 .nav-tabs .cp-modules > .active > a:hover {
   border: 0px !important;
   border-top-right-radius: 0px;
@@ -3630,7 +3760,7 @@ th {
   display: inline-block;
 }
 .quickPreview .updates_timeline:before {
-  background: #e6e6e6;
+  background: #e5e5e5;
   width: 2px;
   margin-left: -1%;
 }
@@ -3645,13 +3775,16 @@ th {
 .quickPreviewComments .recentComments .commentDetails .comment {
   line-height: 15px;
 }
-.quickPreviewComments  .summaryWidgetContainer {
+.quickPreviewComments .summaryWidgetContainer {
   border: 0;
   padding: 0;
 }
 .quickPreview .recentActivitiesContainer .history {
   padding: 0;
 }
+/******************************************* 
+********** Calendar view styles ************
+********************************************/
 .calendar-sidebar {
   width: 100% !important;
 }
@@ -3808,6 +3941,11 @@ th {
   display: inline-block;
   text-align: center;
 }
+/******************************************* 
+********** Calendar view styles end ********
+
+********** Documents Module styles *********
+********************************************/
 .dragdrop-dotted {
   border: 2px dashed #C0C0C0;
   min-width: 300px;
@@ -3867,13 +4005,16 @@ tr.file > td.fileOwnerData {
   width: 100px;
   white-space: pre-wrap;
 }
+/******************************************* 
+********** Documents Module styles end *****
+********************************************/
 .engagementsContainer .engagements_content {
   padding-top: 15px;
 }
 .summaryWidgetContainer .engagementsContainer table {
   width: inherit;
 }
-.engagements_content table thead>tr:first-child {
+.engagements_content table thead > tr:first-child {
   border: 1px solid #CCC;
   background-color: #F5F5F5;
 }
@@ -3924,6 +4065,9 @@ tr.file > td.fileOwnerData {
   font-size: 15px;
   padding: 1% 0;
 }
+/******************************************* 
+********** Mailroom view styles start ********
+********************************************/
 .mailroomBanner {
   margin: 23px 0;
   height: 215px;
@@ -4132,6 +4276,7 @@ tr.file > td.fileOwnerData {
   margin-left: 0;
 }
 .mentionMessages .mention_follow_up {
+  /*//load this color from variable.less*/
   background-color: green;
 }
 .modelContainer .modal-content {
@@ -4280,6 +4425,7 @@ form[name="notification_settings"] .select2-choice {
   margin-left: 0;
 }
 .mentionMessages .mention_follow_up {
+  /*//load this color from variable.less*/
   background-color: green;
 }
 .modal-content .mention_followup .row {
@@ -4311,6 +4457,9 @@ form[name="notification_settings"] .select2-choice {
 .mentionMessageHeader .MultiFile-remove {
   color: #FFFFFF;
 }
+/******************************************* 
+********** Mailroom view styles end ********
+********************************************/
 .detailview-header {
   margin-bottom: 10px;
 }
@@ -4326,6 +4475,7 @@ form[name="notification_settings"] .select2-choice {
   margin: 0px 10px;
   text-decoration: underline !important;
   color: #3498DB;
+  /*font-size : 12px;*/
 }
 .tag {
   display: inline-block;
@@ -4409,11 +4559,10 @@ form[name="notification_settings"] .select2-choice {
   border: 1px solid #dcdcdc;
 }
 #tagCloud .tag {
-  color: #5ea9dd;
-  padding: 0px;
   background-color: #FFFFFF;
   border-color: #FFFFFF;
   border-radius: 0px;
+  color: #5ea9dd;
   margin: 3px;
 }
 #tagCloud .tag[data-type="public"] {
@@ -4424,6 +4573,9 @@ form[name="notification_settings"] .select2-choice {
   max-width: 80px;
   vertical-align: bottom;
 }
+/******************************************* 
+********** Groups view styles ********
+********************************************/
 #s2id_memberList li > div,
 .groupMembersColors li > div {
   margin-left: 10px;
@@ -4498,6 +4650,12 @@ form[name="notification_settings"] .select2-choice {
   margin: 0px;
   color: #444444;
 }
+/******************************************* 
+********** Groups view styles  ends********
+********************************************/
+/******************************************* 
+********** Picklist Css ********
+********************************************/
 .pickListValue {
   background-color: #FFFFFF;
 }
@@ -4512,6 +4670,12 @@ form[name="notification_settings"] .select2-choice {
   padding: 2px 1px !important;
   line-height: 15px;
 }
+/******************************************* 
+************* Dashboard Styles *************
+********************************************/
+li.dashboardWidget {
+  overflow: auto;
+}
 .dashboardWidgetHeader .title {
   padding-bottom: 10px;
   font-size: 15px;
@@ -4532,9 +4696,6 @@ form[name="notification_settings"] .select2-choice {
 .dashBoardContainer .tabContainer .tab-content {
   margin-top: 10px;
 }
-.dashBoardContainer .dashBoardTabContents ul {
-  margin: 0;
-}
 .dashBoardContainer .dashBoardTabContents ul li {
   border: 3px solid #E2E2E4;
   box-shadow: 1px;
@@ -4601,7 +4762,7 @@ form[name="notification_settings"] .select2-choice {
   display: inline-block;
   opacity: 1;
 }
-.dashBoardContainer .tabContainer li a  .deleteTab:hover {
+.dashBoardContainer .tabContainer li a .deleteTab:hover {
   cursor: pointer;
 }
 #minilistWizardContainer .fieldLabel {
@@ -4638,6 +4799,9 @@ form[name="notification_settings"] .select2-choice {
   resize: none;
   width: 100%;
 }
+/******************************************* 
+********** Picklist DependencyGraph ********
+********************************************/
 #dependencyGraph .tableHeading {
   text-align: center;
   padding-top: 30px;
@@ -4663,12 +4827,15 @@ form[name="notification_settings"] .select2-choice {
 #dependencyGraph .dependencyMapping .pickListDependencyTable .selectedCell {
   background: #a9cbf5;
 }
+/******************************************* 
+********** Rewriting select2 for consistency********
+********************************************/
 .select2-container .select2-choice {
   height: 29px;
   border-radius: 1px;
 }
 .modal {
-  z-index: 1100;
+  z-index: 1070;
 }
 .select2-container .select2-choice {
   height: 28px;
@@ -4756,6 +4923,7 @@ hr {
   position: fixed;
   bottom: 0;
   background: #EFEFEF;
+  /*width:100%;*/
   border-left: 42px solid #2c3b49;
   height: 60px;
   left: 0;
@@ -4774,7 +4942,6 @@ hr {
 }
 .settingsPageDiv .modal-overlay-footer {
   margin-left: 230px;
-  border-left: 0px solid;
 }
 .settingsOverlayContainer .modal-overlay-footer {
   margin: 0;
@@ -4797,14 +4964,14 @@ hr {
   vertical-align: middle;
   margin-top: 6px;
 }
-.list-menu-content .pull-right>.dropdown-menu {
+.list-menu-content .pull-right > .dropdown-menu {
   left: -126px;
   position: relative;
 }
-.dropdown-menu>li>a {
+.dropdown-menu > li > a {
   padding: 4px 6px;
 }
-.dropdown-menu>li>a span i {
+.dropdown-menu > li > a span i {
   font-size: 15px;
   vertical-align: middle;
 }
@@ -4812,11 +4979,11 @@ hr {
   max-height: 300px;
   padding-left: 0;
 }
-.related-tabs .dropdown-menu>.mCustomScrollBox>.mCSB_container {
+.related-tabs .dropdown-menu > .mCustomScrollBox > .mCSB_container {
   margin-right: 0;
   padding: 4px 6px;
 }
-.related-tabs .dropdown-menu>.mCustomScrollBox>.mCSB_container>li>a {
+.related-tabs .dropdown-menu > .mCustomScrollBox > .mCSB_container > li > a {
   display: block;
   padding: 3px 5px;
   clear: both;
@@ -4825,7 +4992,7 @@ hr {
   color: #333;
   white-space: nowrap;
 }
-.related-tabs .dropdown-menu>.mCustomScrollBox>.mCSB_container span i {
+.related-tabs .dropdown-menu > .mCustomScrollBox > .mCSB_container span i {
   font-size: 15px;
   vertical-align: middle;
 }
@@ -4848,16 +5015,16 @@ hr {
 .calendar-sidebar .calendar-sidebar-tabs.padding {
   padding-left: 20px !important;
 }
-.related-tabs.row .nav>li {
+.related-tabs.row .nav > li {
   padding: 0 10px;
   margin: 0 2px;
 }
-.massEditTabs.nav>li {
+.massEditTabs.nav > li {
   padding: 0 10px;
   margin: 0 4px;
 }
-.row .nav>li>a,
-.row .nav>li>a:hover {
+.row .nav > li > a,
+.row .nav > li > a:hover {
   padding: 10px 3px;
   border: none;
   vertical-align: bottom;
@@ -4867,38 +5034,39 @@ hr {
   -webkit-box-sizing: border-box;
   -o-box-sizing: border-box;
 }
-.row .nav>li>a:hover {
+.row .nav > li > a:hover {
   border-bottom-color: #555;
 }
-TN-34230
-
-.row .nav>li>a:hover {
+/*.row ul{
+    padding:0;
+}*/
+TN-34230 .row .nav > li > a:hover {
   border-bottom-color: #555;
   background: none;
 }
 .row ul li:first-child {
   margin-left: 0;
 }
-.related-tabs .nav-tabs>li.active,
-.related-tabs .nav-tabs>li:hover,
-.related-tabs .nav-tabs>li.active:focus,
-.dashBoardContainer .nav-tabs>li.active,
-.dashBoardContainer .nav-tabs>li:hover,
-.dashBoardContainer .nav-tabs>li.active:focus,
-.contents.tabbable .nav-tabs>li.active,
-.contents.tabbable .nav-tabs>li:hover,
-.contents.tabbable .nav-tabs>li.active:focus {
+.related-tabs .nav-tabs > li.active,
+.dashBoardContainer .nav-tabs > li.active,
+.contents.tabbable .nav-tabs > li.active,
+.related-tabs .nav-tabs > li:hover,
+.dashBoardContainer .nav-tabs > li:hover,
+.contents.tabbable .nav-tabs > li:hover,
+.related-tabs .nav-tabs > li.active:focus,
+.dashBoardContainer .nav-tabs > li.active:focus,
+.contents.tabbable .nav-tabs > li.active:focus {
   border: none;
   border-bottom: 3px solid #555;
 }
-.nav-tabs>li.active>a,
-.nav-tabs>li.active>a:hover,
-.nav-tabs>li.active>a:focus,
-.nav-tabs>li>a {
+.nav-tabs > li.active > a,
+.nav-tabs > li.active > a:hover,
+.nav-tabs > li.active > a:focus,
+.nav-tabs > li > a {
   border: 0;
 }
-.nav>li>a:hover,
-.nav>li>a:focus {
+.nav > li > a:hover,
+.nav > li > a:focus {
   background-color: #FFFFFF;
 }
 .fa-pencil,
@@ -4908,6 +5076,9 @@ TN-34230
 .commentAttachmentName {
   font-size: 11px;
 }
+/******************************************* 
+********** Layout Editor ********
+********************************************/
 .marginBottom10px {
   margin-bottom: 10px;
 }
@@ -4930,6 +5101,7 @@ TN-34230
 }
 .zeroOpacity {
   opacity: 0;
+  /*for IE*/
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
   filter: alpha(opacity=0);
 }
@@ -4956,10 +5128,12 @@ TN-34230
 .layoutContent .opacity:hover .actions {
   opacity: 1;
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
+  /*for IE*/
   filter: alpha(opacity=100);
 }
 .layoutContent .fieldPropertyContainer:hover .actions {
   opacity: 1;
+  /*for IE*/
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
   filter: alpha(opacity=100);
 }
@@ -4982,6 +5156,7 @@ TN-34230
 .relatedTabModulesList .addButton {
   border-radius: 2px;
   border: 1px solid #DDDDDD;
+  text-transform: uppercase;
   color: #666666;
   background: #FFFFFF;
 }
@@ -5055,6 +5230,9 @@ TN-34230
   margin-left: 5px;
   word-break: break-all;
 }
+/******************************************* 
+************** Tax Management **************
+********************************************/
 #TaxCalculationsContainer .table tr:first-child,
 .taxModalContainer #editTax .table tr:first-child {
   border-bottom: 1px solid #ccc;
@@ -5094,6 +5272,9 @@ TN-34230
   max-height: 500px;
   overflow-y: auto;
 }
+/******************************************* 
+********** Workflows ********
+********************************************/
 #workflow_edit .editViewBody {
   overflow: inherit;
 }
@@ -5103,7 +5284,7 @@ TN-34230
 }
 .timePicker {
   width: 9.5em !important;
-  z-index: 1101 !important;
+  z-index: 1070 !important;
 }
 .weekDaySelect .ui-state-default {
   background: inherit;
@@ -5141,75 +5322,6 @@ TN-34230
 .module-filters.active {
   background: #F7F7F7;
 }
-.payment-type-selection {
-  margin-bottom: 30px;
-}
-.payment-type-selection img {
-  vertical-align: middle;
-}
-.currplan {
-  padding: 10px 20px;
-  background-color: #f3f3f3;
-  border: 1px solid #eee;
-  border-radius: 3px;
-}
-.currplan div {
-  display: inline-block;
-  font-size: 16px;
-}
-.planName {
-  display: inline-block;
-  color: #fff;
-  padding: 20px;
-  margin: 10px 20px;
-  font-size: 24px;
-  border-radius: 2px;
-}
-.plan-heading {
-  min-height: 168px;
-}
-.plan-title {
-  color: #fff;
-  font-size: 20px;
-  padding: 13px 0;
-}
-#sales_plan {
-  background: #3FC380;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#salespremium_plan {
-  background: #00B16A;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#support_plan {
-  background: #2980B9;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#supportpremium_plan {
-  background: #2980B9;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#ultimate_plan,
-#exclusive_plan {
-  background: #F39C12;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#contact_plan {
-  background: #FF5959;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
 .workflowListContainer .select2-container .select2-choice {
   height: 36px;
 }
@@ -5224,6 +5336,7 @@ TN-34230
 .contactAdd {
   border: 1px solid #eee;
   padding: 20px;
+  /*min-height: 310px !important;*/
 }
 #subDetails table td {
   padding: 7px 10px;
@@ -5346,9 +5459,9 @@ TN-34230
 .productBundles {
   padding-left: 20px;
 }
-.nav .open>a,
-.nav .open>a:hover,
-.nav .open>a:focus {
+.nav .open > a,
+.nav .open > a:hover,
+.nav .open > a:focus {
   color: #000000;
   background-color: #FFFFFF;
 }
@@ -5369,6 +5482,9 @@ TN-34230
   width: 100%;
   overflow-x: auto;
 }
+/******************************************* 
+*************** Mail Manager ***************
+********************************************/
 #mm_searchButton {
   height: 28px;
   background-color: #FFFFFF;
@@ -5424,8 +5540,8 @@ TN-34230
   padding: 1px 5px;
   border-radius: 3px;
   text-align: center;
-  text-shadow: 0 1px rgba(0,0,0,0.1);
-  background-image: -webkit-linear-gradient(top,#DD4B39 0,#D14836 100%);
+  text-shadow: 0 1px rgba(0, 0, 0, 0.1);
+  background-image: -webkit-linear-gradient(top, #DD4B39 0, #D14836 100%);
   border: 1px solid #C6322A;
   background-color: #DD4B39;
 }
@@ -5643,6 +5759,7 @@ TN-34230
 .width40per {
   width: 40%;
 }
+/****** Mail Manager Ends ******/
 .quickCreateContent .massEditTable textarea,
 .addCommentBlock .commentTextArea textarea {
   resize: vertical;
@@ -5655,19 +5772,20 @@ TN-34230
 .select2-container-multi .select2-choices {
   z-index: 1;
 }
-.nav .nav-stacks .cp-nav-header-wrapper>li.disabled>a:hover {
+/****** Customer Portal Settings ******/
+.nav .nav-stacks .cp-nav-header-wrapper > li.disabled > a:hover {
   background-color: #fff;
 }
-.cp-nav-header-wrapper>li.disabled>a:hover {
+.cp-nav-header-wrapper > li.disabled > a:hover {
   border: 0px ! important;
 }
-.nav .nav-stacks .cp-nav-header-wrapper>li.disabled>a {
+.nav .nav-stacks .cp-nav-header-wrapper > li.disabled > a {
   background-color: #fff;
 }
-#portalModulesTable>li.portalModuleRow.active>a:hover {
+#portalModulesTable > li.portalModuleRow.active > a:hover {
   background-color: #fff !important;
 }
-#portalModulesTable>li.portalModuleRow.active>a:focus {
+#portalModulesTable > li.portalModuleRow.active > a:focus {
   background-color: #fff !important;
 }
 .portal-dashboard {
@@ -5766,7 +5884,7 @@ TN-34230
 .portal-dashboard {
   border-bottom: 0px ! important;
 }
-#portal-shortcutsContainer>ul {
+#portal-shortcutsContainer > ul {
   border-bottom: 0px ! important;
 }
 .portalMenuHeader {
@@ -5775,14 +5893,15 @@ TN-34230
 }
 .cp-tabs .enabledModules {
   display: inline-block ! important;
-  margin-left: 4px !important;
-  margin-right: 4px !important;
+  margin-left: 4px!important;
+  margin-right: 4px!important;
   vertical-align: top;
   margin-top: 4px !important;
 }
 .portal-shortcut-list:hover {
   border-bottom: 3px solid transparent ! important;
 }
+/****** Customer Portal Settings ******/
 .label-radio label input[type="radio"] {
   position: relative;
   top: 2px;
@@ -5794,6 +5913,9 @@ TN-34230
 div.tooltip-inner {
   max-width: 400px;
 }
+/******************************************* 
+********** Menu Editor ********
+********************************************/
 .sortable.appContainer.ui-sortable {
   width: 160px;
 }
@@ -5968,7 +6090,7 @@ div.tooltip-inner {
   width: 13px !important;
   margin-top: 8px;
 }
-.detailview-table .input-group-addon+.inputElement.form-control,
+.detailview-table .input-group-addon + .inputElement.form-control,
 .detailview-table .inputElement.form-control.input-medium {
   width: 100%;
 }
@@ -6015,6 +6137,7 @@ div.tooltip-inner {
   float: left;
   margin-right: 5px;
 }
+/***** Oursites Changes *****/
 .portal-table .table-actions {
   width: inherit ! important;
 }
@@ -6026,6 +6149,7 @@ div.tooltip-inner {
   padding: 10px 5px ! important;
   padding-left: 10px ! important;
 }
+/***** Oursites Changes *****/
 .ExtensionscontentsDiv .content-area {
   padding-left: 15px;
   padding-right: 15px;
@@ -6039,14 +6163,14 @@ div.tooltip-inner {
 }
 .blockHeader {
   border-color: #F3F3F4 #F3F3F4 #cbcbcf;
-  border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
   background-color: #474747;
-  background-image: -moz-linear-gradient(top,#555555,#333333);
-  background-image: -ms-linear-gradient(top,#555555,#333333);
-  background-image: -webkit-gradient(linear,0 0,0 100%,from(#555555),to(#333333));
-  background-image: -webkit-linear-gradient(top,#555555,#333333);
-  background-image: -o-linear-gradient(top,#555555,#333333);
-  background-image: linear-gradient(top,#555555,#333333);
+  background-image: -moz-linear-gradient(top, #555555, #333333);
+  background-image: -ms-linear-gradient(top, #555555, #333333);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#333333));
+  background-image: -webkit-linear-gradient(top, #555555, #333333);
+  background-image: -o-linear-gradient(top, #555555, #333333);
+  background-image: linear-gradient(top, #555555, #333333);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#333333', GradientType=0);
   min-height: 30px;
@@ -6139,8 +6263,8 @@ div.tooltip-inner {
 .markStar .starredStatus {
   display: none;
 }
-.nav>li.addDashboardTab>a,
-.nav>li.addDashboardTab>a:hover {
+.nav > li.addDashboardTab > a,
+.nav > li.addDashboardTab > a:hover {
   padding: 10px 15px;
   background: inherit;
 }
@@ -6153,7 +6277,7 @@ div.tooltip-inner {
   height: 960px;
   width: 1260px;
 }
-.nav-tabs>li {
+.nav-tabs > li {
   border-bottom: 3px solid transparent;
   margin: 0 2px;
 }
@@ -6231,16 +6355,14 @@ div.tooltip-inner {
 }
 .select2-container.select2-container-multi.select2,
 .editViewPageDiv .select2-container.select2-container-multi.select2 {
-  height: auto !important;
+  height: auto!important;
 }
-.summaryViewFields .select2-container-multi.inputElement.form-control
-.quickCreateContent .select2-container.select2-container-multi.select2,
+.summaryViewFields .select2-container-multi.inputElement.form-control .quickCreateContent .select2-container.select2-container-multi.select2,
 #massEditContainer .select2-container.select2-container-multi.select2 {
   width: 150px;
   height: auto !important;
 }
-.summaryViewFields .select2-container-multi.inputElement.form-control
-.quickCreateContent .select2-container.select2-container-multi.select2 .input-save-wrap,
+.summaryViewFields .select2-container-multi.inputElement.form-control .quickCreateContent .select2-container.select2-container-multi.select2 .input-save-wrap,
 #massEditContainer .select2-container.select2-container-multi.select2 .input-save-wrap {
   float: right;
   margin-right: 25px;
@@ -6336,6 +6458,7 @@ a.cp-modules:hover {
 #RestrictionsLayout {
   background: #fafafb;
   margin-top: -92px;
+  /*to adjust with page padding top*/
 }
 #RestrictionsLayout .vtImage {
   width: 22%;
@@ -6369,6 +6492,7 @@ a.cp-modules:hover {
 .datepicker {
   z-index: 1100 !important;
 }
+/*****RSS Changes****/
 .feedListContainer .listview-table tr td:first-child,
 .listview-table tr th:first-child {
   width: inherit ! important;
@@ -6376,12 +6500,14 @@ a.cp-modules:hover {
 .feedListContainer .listViewEntries .listViewEntryValue {
   max-width: inherit ! important;
 }
-.ps-container>.ps-scrollbar-y-rail {
+/*****RSS Changes****/
+.ps-container > .ps-scrollbar-y-rail {
   z-index: 1002;
 }
 #relationBlock .recordScroll {
   max-height: 150px;
 }
+/*Start - List sidebar toggle*/
 .essentials-toggle {
   background-color: white;
   font-weight: bold;
@@ -6401,6 +6527,7 @@ a.cp-modules:hover {
 .essentials-toggle .fa-chevron-right {
   background-position: -460px -72px !important;
 }
+/*End - List essentials toggle*/
 .module-name-tooltip .qtip-content {
   font-size: 12px;
   padding: 3px;
@@ -6484,8 +6611,8 @@ li.select2-search-choice div {
 .popover ul.listmenu li {
   padding: 3px;
 }
-.popover-content .disabled>a,
-.popover .disabled>a {
+.popover-content .disabled > a,
+.popover .disabled > a {
   opacity: 0.5;
   cursor: not-allowed;
 }
@@ -6496,6 +6623,7 @@ li.select2-search-choice div {
   -o-transform: rotate(180deg);
   transform: rotate(180deg);
 }
+/*Start - List sidebar toggle*/
 .essentials-toggle {
   background-color: white;
   font-weight: bold;
@@ -6515,6 +6643,7 @@ li.select2-search-choice div {
 .essentials-toggle .fa-chevron-right {
   background-position: -460px -72px !important;
 }
+/*End - List essentials toggle*/
 .module-name-tooltip .qtip-content {
   font-size: 12px;
   padding: 3px;
@@ -6595,16 +6724,16 @@ li.select2-search-choice div {
 #reportDetails .pivot .toptitle.targetY0,
 #reportDetails .pivot .lefttitle.targetX0 {
   border-color: #F3F3F4 #F3F3F4 #cbcbcf;
-  border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
   background-color: #474747;
-  background-image: -moz-linear-gradient(top,#555555,#333333);
-  background-image: -ms-linear-gradient(top,#555555,#333333);
-  background-image: -webkit-gradient(linear,0 0,0 100%,from(#555555),to(#333333));
-  background-image: -webkit-linear-gradient(top,#555555,#333333);
-  background-image: -o-linear-gradient(top,#555555,#333333);
-  background-image: linear-gradient(top,#555555,#333333);
+  background-image: -moz-linear-gradient(top, #555555, #333333);
+  background-image: -ms-linear-gradient(top, #555555, #333333);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#333333));
+  background-image: -webkit-linear-gradient(top, #555555, #333333);
+  background-image: -o-linear-gradient(top, #555555, #333333);
+  background-image: linear-gradient(top, #555555, #333333);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555',endColorstr='#333333',GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#333333', GradientType=0);
   min-height: 30px;
 }
 #reportDetails .pivot th.toptitle.targetY0,
@@ -6646,7 +6775,8 @@ li.select2-search-choice div {
   background: #FFFFFF;
 }
 .templateActions {
-  background: rgba(0,0,0,0.1);
+  background: rgba(0, 0, 0, 0.1);
+  /*padding: 4%;*/
   bottom: 0;
   text-align: center;
   position: absolute;
@@ -6654,6 +6784,9 @@ li.select2-search-choice div {
   zoom: 1;
   width: 100%;
 }
+/*.templateActions i {
+    margin-right: 30px;
+}*/
 .thumbnails > li {
   float: left;
   height: 315px !important;
@@ -6828,9 +6961,10 @@ a.btnReport:hover {
   left: 0px;
 }
 .bx-wrapper .bx-viewport {
-  width:99%;
+  width: 99%;
   left: 0px;
   background: #fff;
+  /*fix other elements on the page moving (on Chrome)*/
   -webkit-transform: translatez(0);
   -moz-transform: translatez(0);
   -ms-transform: translatez(0);
@@ -6888,7 +7022,7 @@ a.btnReport:hover {
 .filter-search-show {
   display: block !important;
 }
-.emailTemplatesPopupTableContainer .listViewEntries  .listViewEntryValue {
+.emailTemplatesPopupTableContainer .listViewEntries .listViewEntryValue {
   max-width: 100%;
   min-width: 150px;
 }
@@ -6923,12 +7057,15 @@ input:focus::-webkit-input-placeholder {
 input:focus:-moz-placeholder {
   color: transparent;
 }
+/* FF 4-18 */
 input:focus::-moz-placeholder {
   color: transparent;
 }
+/* FF 19+ */
 input:focus:-ms-input-placeholder {
   color: transparent;
 }
+/* IE 10+ */
 .global-actions .dropdown-menu:before {
   position: absolute;
   top: -7px;
@@ -6937,7 +7074,7 @@ input:focus:-ms-input-placeholder {
   border-right: 7px solid transparent;
   border-bottom: 7px solid #ccc;
   border-left: 7px solid transparent;
-  border-bottom-color: rgba(0,0,0,0.2);
+  border-bottom-color: rgba(0, 0, 0, 0.2);
   content: '';
 }
 .global-actions .dropdown-menu:after {
@@ -7122,6 +7259,7 @@ input:focus:-ms-input-placeholder {
   text-align: center;
 }
 #OnBoardLayout #OnBoardPageContainer .crmGoals textarea::-webkit-input-placeholder {
+  /* WebKit browsers */
   text-align: center;
   padding: 20%;
   font-size: 12px;
@@ -7267,121 +7405,3 @@ input:focus:-ms-input-placeholder {
   border-left: 3px solid #8E44AD;
   opacity: 1;
 }
-.fieldValue .value a {
-  color: #15c !important;
-}
-.editViewContents .fieldLabel {
-  min-width: 100px;
-  width: 20%;
-  word-break: break-all;
-}
-.editViewContents .fieldValue {
-  width:30%;
-}
-.editViewContents td.fieldValue[colspan="3"] {
-  width:80%;
-}
-.editViewContents textarea.textAreaElement {
-  width: 88%;
-}
-.editViewContents input[type="checkbox"] {
-  width: 15px;
-  height: 15px;
-}
-.editViewContents input[type="radio"] {
-  width: 15px;
-  height: 15px;
-}
-#composeEmailContainer .modal-body .quickCreateContent,
-#QuickCreate .modal-body .quickCreateContent,
-#create .quickCreateContent {
-  margin-top: 25px;
-}
-.settingsgroup-panel .widgetContainer .menuItemLabel .pinUnpinShortCut {
-  display: none;
-  margin-top: 2px;
-}
-.settingsgroup-panel .widgetContainer .menuItemLabel:hover .pinUnpinShortCut {
-  display: inline-block;
-}
-@-moz-document url-prefix() {
-  .duplicateHandlingContainer .tooltip-inner {
-    width: 550px;
-    max-width: 550px;
-  }
-}
-.duplicateHandlingContainer .tooltip-inner {
-  text-align: left !important;
-}
-.duplicateHandlingContainer .syncMessage {
-  margin-top: 5px !important;
-}
-.duplicateHandlingContainer .actionsList {
-  width: 230px !important;
-}
-.duplicationMessageContainer {
-  background-color: #f2dede !important;
-  color: #b94a48 !important;
-}
-.duplicationMessageContainer .duplicationMessageHeader {
-  margin-bottom: 8px;
-}
-.listViewRecordActions .quickView, .listViewRecordActions .markStar,
-.listViewRecordActions .markAsHeld,.listViewRecordActions .holdFollowupOn {
-  margin-top: 4px;
-}
-.app-menu .module-icon .custom-module {
-	font-size: 14px;
-	border-radius: 4px;
-	color: #000;
-	background-color: #fff;
-	padding: 4px 10px 4px 5px !important
-}
-.menu-item .custom-module {
-	font-family: 'OpenSans-Regular', sans-serif;
-	font-size: 12px;
-	border-radius: 4px;
-	padding: 2px;
-	color: #000;
-	background-color: #fff;
-}
-.modules-menu .custom-module {
-	color: #fff;
-	margin-left: 0px;
-	display: inline;
-	border: 1px solid #fff;
-	border-radius: 4px;
-	padding: 3px 4px 3px 2px !important;
-	font-weight: bold;
-}
-#quickCreateModules .custom-module, .workflowListContainer .custom-module, .dashBoardTabContents .custom-module {
-	border-radius: 4px;
-	padding: 3px 5px;
-	color: #fff;
-	background-color: #777;
-}
-.menuEditorItem .custom-module {
-	border-radius: 4px;
-	padding: 3px 5px;
-	color: #000;
-	background-color: #fff;
-}
-.task-details .custom-module {
-	border-radius: 4px;
-	padding: 1px 4px;
-	color: white;
-	background-color: #777;
-}
-.related-tabs .custom-module, #relatedmenuList .custom-module {
-	border-radius: 4px;
-	color: #fff;
-	background-color: #777;
-	padding: 5px 7px;
-	font-weight: bold;
-}
-.record-header .custom-module {
-	font-size: 30px;
-}
-.moduleIcon .custom-module {
-	font-weight: bold;
-}
\ No newline at end of file
diff --git a/layouts/v7/skins/sales/style.css b/layouts/v7/skins/sales/style.css
index 75e92f9288a72c904025e78470e7714f243184f3..ac369cd3d1e58f66718b477fc89a12b241514b8e 100644
--- a/layouts/v7/skins/sales/style.css
+++ b/layouts/v7/skins/sales/style.css
@@ -1,7 +1,9 @@
 @font-face {
   font-family: 'Oswald';
   src: url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.eot');
-  src: url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.eot?#iefix') format('embedded-opentype'), url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.woff') format('woff'), url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.ttf') format('truetype'), url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.svg#Oswald') format('svg');
+  /* IE9 Compat Modes */
+  src: url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.svg#Oswald') format('svg');
+  /* Legacy iOS */
   font-weight: normal;
   font-style: normal;
   text-rendering: optimizeLegibility;
@@ -15,27 +17,37 @@ a:active {
 @font-face {
   font-family: 'OpenSans-Regular';
   src: url('../fonts/OpenSans/Regular/OpenSans-Regular.eot');
-  src: url('../fonts/OpenSans/Regular/OpenSans-Regular.ttf') format('truetype'), url('../fonts/OpenSans/Regular/OpenSans-Regular.eot?#iefix') format('embedded-opentype'), url('../fonts/OpenSans/Regular/OpenSans-Regular.woff2') format('woff2'), url('../fonts/OpenSans/Regular/OpenSans-Regular.woff') format('woff'), url('../fonts/OpenSans/Regular/OpenSans-Regular.svg#svgFontName') format('svg');
+  /* IE9 Compat Modes */
+  src: url('../fonts/OpenSans/Regular/OpenSans-Regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/OpenSans/Regular/OpenSans-Regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/OpenSans/Regular/OpenSans-Regular.woff2') format('woff2'), /* Super Modern Browsers */ url('../fonts/OpenSans/Regular/OpenSans-Regular.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/OpenSans/Regular/OpenSans-Regular.svg#svgFontName') format('svg');
+  /* Legacy iOS */
 }
 @font-face {
   font-family: 'OpenSans-Semibold';
   src: url('../fonts/OpenSans/Semibold/OpenSans-Semibold.eot');
-  src: url('../fonts/OpenSans/Semibold/OpenSans-Semibold.ttf') format('truetype'), url('../fonts/OpenSans/Semibold/OpenSans-Semibold.eot?#iefix') format('embedded-opentype'), url('../fonts/OpenSans/Semibold/OpenSans-Semibold.woff2') format('woff2'), url('../fonts/OpenSans/Semibold/OpenSans-Semibold.woff') format('woff'), url('../fonts/OpenSans/Semibold/OpenSans-Semibold.svg#svgFontName') format('svg');
+  /* IE9 Compat Modes */
+  src: url('../fonts/OpenSans/Semibold/OpenSans-Semibold.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/OpenSans/Semibold/OpenSans-Semibold.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/OpenSans/Semibold/OpenSans-Semibold.woff2') format('woff2'), /* Super Modern Browsers */ url('../fonts/OpenSans/Semibold/OpenSans-Semibold.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/OpenSans/Semibold/OpenSans-Semibold.svg#svgFontName') format('svg');
+  /* Legacy iOS */
 }
 @font-face {
   font-family: 'ProximaNova-Regular';
-  src: url('../fonts/ProximanovaWebfont/ProximaNova-Regular.ttf') format('truetype'), url('../fonts/ProximanovaWebfont/ProximaNova-Regular.woff') format('woff'), url('../fonts/ProximanovaWebfont/ProximaNova-Regular.eot?#iefix') format('embedded-opentype');
+  src: url('../fonts/ProximanovaWebfont/ProximaNova-Regular.ttf') format('truetype'), url('../fonts/ProximanovaWebfont/ProximaNova-Regular.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/ProximanovaWebfont/ProximaNova-Regular.eot?#iefix') format('embedded-opentype');
+  /* IE6-IE8 */
+  /* Safari, Android, iOS */
   font-style: normal;
   font-weight: normal;
   text-rendering: optimizeLegibility;
 }
 @font-face {
   font-family: 'ProximaNova-Semibold';
-  src: url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.ttf') format('truetype'), url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.woff') format('woff'), url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.eot?#iefix') format('embedded-opentype');
+  src: url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.eot?#iefix') format('embedded-opentype');
+  /* IE6-IE8 */
   font-style: normal;
   font-weight: normal;
   text-rendering: optimizeLegibility;
 }
+/**********************************/
+/************ Layout **************/
+/**********************************/
 html {
   height: 100%;
   overflow-y: auto;
@@ -102,6 +114,7 @@ body {
 @media (min-width: 992px) {
   .global-nav .logo-container {
     display: inline-block;
+    width: 150px;
     z-index: 2;
     padding-left: 6%;
     margin-top: 1px;
@@ -113,11 +126,13 @@ body {
     position: absolute;
     width: 100%;
     height: 42px;
+    /*        border-top:1px solid #ddd;*/
     border-bottom: 1px solid #ddd;
   }
   .app-nav .module-action-bar .module-action-content {
     background: #FBFBFB;
     height: 41px;
+    /*        border-bottom: 1px solid #eee;*/
   }
   .app-nav .module-action-bar .module-action-content .navbar-right {
     margin-right: 0;
@@ -163,7 +178,7 @@ body {
     padding-left: 0;
   }
 }
-.btn-toolbar >.btn-group:first-child {
+.btn-toolbar > .btn-group:first-child {
   margin-left: 5px;
 }
 .vt-notification {
@@ -196,15 +211,19 @@ body {
 .vt-notification [data-notify="message"] {
   color: #eaeaea;
 }
+/**********************************/
+/******** Navigation styles *******/
+/**********************************/
 .company-logo {
   height: 40px;
+  width: 150px;
   margin: 0 0;
   display: inline-block;
   margin-left: 1px;
 }
 .company-logo img {
-  max-height: 100%;
-  max-width: 100%;
+  height: 100%;
+  width: auto;
 }
 .navbar .fa {
   font-size: 15px;
@@ -214,10 +233,13 @@ body {
   font-size: 16px;
   position: relative;
 }
+/*.module-action-bar .module-action-content #appnav{
+    padding-top:5px;
+}*/
 .global-nav .navbar-nav > li div a {
   padding: 15px;
 }
-.global-nav>ul {
+.global-nav > ul {
   margin-right: 20px;
 }
 .global-nav .search-links-container {
@@ -267,26 +289,28 @@ body {
     float: right;
     height: 42px;
   }
-  .module-action-bar .navbar-right .nav>li {
+  .module-action-bar .navbar-right .nav > li {
     display: inline-block;
   }
-  .module-action-bar .navbar-right .nav>li a {
+  .module-action-bar .navbar-right .nav > li a {
     padding: 0 10px;
   }
   .global-nav .logo-container {
     border-bottom: 0;
+    width: 150px;
   }
 }
 @media (max-width: 991px) {
   .global-nav .logo-container {
     border-bottom: 0;
+    width: 150px;
   }
   .notificationMessageHolder {
     padding-left: 45%;
   }
 }
 @media (min-width: 991px) {
-  .nav>li>a.qc-button {
+  .nav > li > a.qc-button {
     padding: 2px 3px;
     margin-top: 13px;
     margin-right: 15px;
@@ -294,7 +318,7 @@ body {
     color: #fff;
     border-radius: 20px;
   }
-  .nav>li>a.qc-button span {
+  .nav > li > a.qc-button span {
     vertical-align: top;
   }
 }
@@ -313,6 +337,7 @@ body {
   width: 100%;
   height: 100%;
 }
+/** App Nav Styles */
 .active-app-title {
   white-space: nowrap;
   font-family: Oswald, "OpenSans-Semibold", "Helvetica Neue", Helvetica, sans-serif;
@@ -367,7 +392,9 @@ body {
   height: 42px;
   text-align: center;
   line-height: 42px;
+  /*    background-color: #2c3b49;*/
   color: #ffffff;
+  /*border-bottom: 1px solid #272B46;*/
 }
 .app-nav .app-indicator-icon-container .app-indicator-icon {
   font-size: 24px;
@@ -479,16 +506,16 @@ body {
   right: -4px;
 }
 #overlayPageContent .mCSB_scrollTools,
-#overlayPageContent .mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar,
-#overlayPageContent .mCSB_scrollTools .mCSB_buttonUp,
-#overlayPageContent .mCSB_scrollTools .mCSB_buttonDown,
-#overlayPageContent .mCSB_scrollTools .mCSB_buttonLeft,
-#overlayPageContent .mCSB_scrollTools .mCSB_buttonRight,
 .app-list .mCSB_scrollTools,
+#overlayPageContent .mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar,
 .app-list .mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar,
+#overlayPageContent .mCSB_scrollTools .mCSB_buttonUp,
 .app-list .mCSB_scrollTools .mCSB_buttonUp,
+#overlayPageContent .mCSB_scrollTools .mCSB_buttonDown,
 .app-list .mCSB_scrollTools .mCSB_buttonDown,
+#overlayPageContent .mCSB_scrollTools .mCSB_buttonLeft,
 .app-list .mCSB_scrollTools .mCSB_buttonLeft,
+#overlayPageContent .mCSB_scrollTools .mCSB_buttonRight,
 .app-list .mCSB_scrollTools .mCSB_buttonRight {
   -webkit-transition: none;
   transition: none;
@@ -700,6 +727,7 @@ a.menu-item:hover {
   width: 0px;
   overflow: hidden;
 }
+/* User Logout */
 .logout-content {
   padding: 10px;
   width: 350px;
@@ -754,6 +782,9 @@ a.menu-item:hover {
 .app-settings {
   background: #FFFFFF;
 }
+/*************************************************/
+/******** View styles (List/Edit/Detail..) *******/
+/*************************************************/
 .viewContent .content-area {
   padding-left: 50px;
 }
@@ -791,7 +822,6 @@ a.menu-item:hover {
 .fieldValue .value {
   max-width: 85%;
   display: inline-block;
-  word-break: break-word;
 }
 .modal-header button.close {
   padding: 0;
@@ -865,6 +895,9 @@ input[type="password"].inputElement {
   padding-right: 20px;
   padding-left: 20px;
 }
+/**********************************/
+/**** Side vertical Nav styles ****/
+/**********************************/
 .module-nav {
   background: #fff;
   z-index: 1004;
@@ -880,6 +913,9 @@ input[type="password"].inputElement {
   left: 0;
   transition: 0s width;
 }
+.module-nav:hover {
+  /*z-index: 1001;*/
+}
 .modules-menu ul {
   list-style: none;
   margin-left: 0;
@@ -914,7 +950,7 @@ input[type="password"].inputElement {
   float: left;
   font-size: 20px;
 }
-.modules-menu ul li a>span {
+.modules-menu ul li a > span {
   margin-left: 10px;
   vertical-align: middle;
   font-size: 13px;
@@ -954,6 +990,7 @@ input[type="password"].inputElement {
   width: 100%;
   left: 0%;
 }
+/** Lists Menu in Side bar */
 .module-filters .settings-sidebar,
 .module-filters .sidebar-container {
   padding: 0 12px;
@@ -987,6 +1024,7 @@ input[type="password"].inputElement {
 .lists-menu-container hr {
   margin: 5px 0;
 }
+/* mScrollbar customization for lists widget */
 .lists-menu-container .menu-scroller .mCSB_scrollTools {
   width: 13px;
 }
@@ -998,8 +1036,10 @@ input[type="password"].inputElement {
 .modules-menu .mCSB_scrollTools .mCSB_draggerContainer {
   left: 8px;
 }
+/* Customization ends */
 .lists-menu-container .list-menu-content .more-less-link {
   color: #fff;
+  /*text-decoration: none;*/
 }
 .lists-menu-container .list-menu-content .sub-header {
   color: #ddd;
@@ -1104,9 +1144,11 @@ input[type="password"].inputElement {
 .common-links-container > div a {
   color: #fff;
 }
+/*Search Container styles */
 .search-container {
   min-height: 300px;
   position: absolute;
+  /*z-index: 1030;*/
   width: 100%;
   top: 0;
   background: #FBFBFB;
@@ -1125,6 +1167,7 @@ input[type="password"].inputElement {
 .footer p {
   margin: 5px 0;
 }
+/*** Utilities ***/
 .showElement {
   display: block !important;
   height: 100%;
@@ -1247,11 +1290,11 @@ ul.unstyled {
 }
 .emptyRecordsDiv .emptyRecordsContent {
   display: inline-block;
-  font-size: 16px;
   left: 50%;
   margin-left: -25%;
   position: absolute;
   width: 50%;
+  font-size: 16px;
 }
 .textOverflowEllipsis {
   overflow: hidden;
@@ -1276,6 +1319,9 @@ ul.unstyled {
 .removeNoFileChosen {
   color: transparent !important;
 }
+/***********************************
+**********Button Styles**********
+***********************************/
 .module-buttons-container {
   float: right;
   margin-right: 10px;
@@ -1297,6 +1343,7 @@ ul.unstyled {
   margin: 4px 2px;
   border-radius: 2px;
   border: 1px solid #ddd;
+  text-transform: uppercase;
   color: #666;
   background: #fff;
 }
@@ -1317,6 +1364,9 @@ ul.unstyled {
   color: #FFFFFF !important;
   background: #5bc0de !important;
 }
+/***********************************
+**********List View Styles**********
+***********************************/
 .fa.pull-left {
   margin-right: 0;
 }
@@ -1351,7 +1401,7 @@ ul.unstyled {
   font-size: 20px;
 }
 .listview-pagination .disabled {
-  color: rgba(0,0,0,0.2);
+  color: rgba(0, 0, 0, 0.2);
 }
 .listview-pagination .disabled:hover {
   cursor: default;
@@ -1379,6 +1429,8 @@ ul.unstyled {
 .listview-table {
   margin-bottom: 0;
   border-top: 0;
+  /* Horizontal scroll will not work if table layout Fixed */
+  /*    table-layout: fixed;*/
 }
 .listview-table tr td,
 .listview-table tr th {
@@ -1408,7 +1460,7 @@ ul.unstyled {
   width: 100%;
 }
 .listViewEntries .relatedListEntryValues .fieldValue .value,
-.listViewEntries  .listViewEntryValue .fieldValue .value {
+.listViewEntries .listViewEntryValue .fieldValue .value {
   vertical-align: middle;
   width: 100%;
   display: inline-block;
@@ -1423,7 +1475,7 @@ ul.unstyled {
 }
 .listview-table-norecords .table-actions,
 .listview-table .table-actions {
-  width: 120px;
+  width: 110px;
   font-size: 15px;
   color: #555;
   margin-left: 7px;
@@ -1489,13 +1541,13 @@ input[type=checkbox]:checked {
   vertical-align: middle;
   display: table-cell;
 }
-.listview-table  tr.searchRow th {
+.listview-table tr.searchRow th {
   padding: 5px 3px;
 }
-.listview-table  tr.searchRow th.inline-search-btn {
+.listview-table tr.searchRow th.inline-search-btn {
   padding: 3px 10px;
 }
-.listview-table  tr.searchRow th.inline-search-btn button {
+.listview-table tr.searchRow th.inline-search-btn button {
   text-align: center;
   width: 85%;
   text-shadow: none;
@@ -1523,6 +1575,18 @@ input[type=checkbox]:checked {
   background-color: #FFEEEE !important;
   background-image: none !important;
 }
+/*.floatThead-wrapper .table-container{
+    z-index: 0 !important;
+}*/
+/* List view bottom fixed scroll */
+/*.bottom-fixed-scroll{
+    height: 14px;
+    position: relative;
+    top: -15px;
+    overflow-x: auto;
+    overflow-y: hidden;
+    width: 100%;
+}*/
 .scroller-div {
   height: 1px;
 }
@@ -1644,12 +1708,12 @@ input[type=checkbox]:checked {
 #listColumnFilterContainer .disabled i {
   color: #ccc;
 }
+/**********************************
+**********Detail View Styles**********
+**********************************/
 .detailViewButtoncontainer {
   padding-top: 5px;
 }
-.detailViewButtoncontainer button.btn {
-  margin: 0px 1px !important;
-}
 .detailview-header .recordBasicInfo > .info-row {
   margin-bottom: 4px;
 }
@@ -1730,9 +1794,6 @@ th {
   margin-top: 3%;
   margin-right: 2%;
 }
-.overlayDetailHeader button.btn {
-  margin: 0px 1px !important;
-}
 .referencefield-wrapper .createReferenceRecord {
   float: left;
   margin-left: 5px;
@@ -1972,10 +2033,10 @@ th {
   z-index: 1030;
 }
 .overlay-container-60 {
-  margin-left: 42px;
+  margin-left: 42px ;
 }
 .overlay-container-300 {
-  margin-left: 230px;
+  margin-left: 230px ;
 }
 .overlayPageContent {
   background: #FFFFFF;
@@ -2098,6 +2159,9 @@ th {
   height: 26px;
   line-height: 25px;
 }
+/**********************************
+**********Summary View Styles******
+**********************************/
 .summary-table {
   width: 100%;
   table-layout: fixed;
@@ -2218,33 +2282,33 @@ th {
   opacity: 1;
   cursor: pointer;
 }
-.details.row >form .social-media-toggle {
+.details.row > form .social-media-toggle {
   position: absolute;
   right: -15px;
   display: inline-block;
   width: 500px;
   border-left: 0px;
 }
-.details.row >form .social-media-widget {
+.details.row > form .social-media-widget {
   border-left: 1px solid #ddd;
   border-bottom: 1px solid #ddd;
   height: 100%;
   background: white;
 }
-.details.row >form div[class*="col-"].resizable-summary-view {
+.details.row > form div[class*="col-"].resizable-summary-view {
   padding-left: 0;
   padding-right: 0px;
 }
-.details.row >form>div[class*="col-"],
-.details.row >form .resizable-summary-view div[class*="col-"] {
+.details.row > form > div[class*="col-"],
+.details.row > form .resizable-summary-view div[class*="col-"] {
   padding-right: 0;
   padding: 0px 5px;
 }
-.details.row >form>div[class*="col-"]:first-child,
-.details.row >form .left-block {
+.details.row > form > div[class*="col-"]:first-child,
+.details.row > form .left-block {
   padding-left: 0 !important;
 }
-.details.row >form>div[class*="col-"]:last-child {
+.details.row > form > div[class*="col-"]:last-child {
   padding-right: 0;
 }
 .summaryWidgetContainer .noContent {
@@ -2257,6 +2321,9 @@ th {
 .caseReplyArea .nav > li {
   padding: 0 10px;
 }
+/**********************************
+**********Edit View Styles*******
+**********************************/
 .main-container .editViewModNavigator.module-nav,
 .editViewModNavigator .mod-switcher-container,
 .editViewModNavigator .modules-menu {
@@ -2297,7 +2364,7 @@ th {
   width: 100%;
 }
 .editViewContents .input-group {
-  width: 229px;
+  width: 208px;
   float: left;
 }
 .input-group.inputElement .input-group-addon {
@@ -2376,6 +2443,9 @@ th {
   z-index: 1000;
   padding: 7px;
 }
+/**********************************
+**********Advance Search styles**********
+**********************************/
 .op0.fadeInx {
   opacity: 1;
 }
@@ -2448,7 +2518,11 @@ th {
 }
 .btn + input {
   margin-left: 5px;
+  /*    margin-top : 3px;*/
 }
+/**********************************
+**********Extension Store Styles**********
+**********************************/
 .extensionstore .app-trigger {
   width: 98%;
 }
@@ -2479,6 +2553,9 @@ th {
 .extensionContents .extensionError {
   color: #F10404;
 }
+/**********************************
+**********Extension Store Nav Bar**********
+**********************************/
 .tabbable-line > .nav-tabs {
   border: none;
   margin: 0px;
@@ -2547,6 +2624,9 @@ th {
 .extensionContents .listview-table {
   width: 100%;
 }
+/*******************************************
+******Detail View related list styles*******
+********************************************/
 .relatedContents .listViewContentHeaderValues:hover {
   text-decoration: none;
   color: #333;
@@ -2604,6 +2684,9 @@ th {
 .relatedViewActions .btn-group {
   margin-right: 15px;
 }
+/*******************************************
+****************** Modal *******************
+********************************************/
 .modal-header {
   padding: 5px 15px;
   background: #596875;
@@ -2631,6 +2714,7 @@ th {
   width: 100%;
   float: left;
   background: #596875;
+  /*    height: 100%;*/
 }
 .settings-menu {
   display: inline-block;
@@ -2647,7 +2731,7 @@ th {
   cursor: n-resize;
 }
 .settings-menu-items {
-  box-shadow: 0 1px 1px rgba(0,0,0,0.05);
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
   margin-bottom: 10px;
   text-align: justify;
 }
@@ -2765,9 +2849,6 @@ th {
 .active .stepNum {
   color: #FFFFFF;
 }
-.mailBoxEditDiv .crumbs li {
-  width: 22%;
-}
 .stepNum {
   display: inline-block;
   padding: 0 5px;
@@ -2776,6 +2857,7 @@ th {
   vertical-align: middle;
   color: #3399ff;
 }
+/* .squaredFour */
 .squaredFour {
   width: 20px;
   position: relative;
@@ -2789,9 +2871,9 @@ th {
   top: 0;
   left: 0;
   background: #fcfff4;
-  background: linear-gradient(top,#fcfff4 0%,#dfe5d7 40%,#b3bead 100%);
+  background: linear-gradient(top, #fcfff4 0%, #dfe5d7 40%, #b3bead 100%);
   border-radius: 4px;
-  box-shadow: inset 0px 1px 1px white, 0px 1px 3px rgba(0,0,0,0.5);
+  box-shadow: inset 0px 1px 1px white, 0px 1px 3px rgba(0, 0, 0, 0.5);
 }
 .squaredFour label:after {
   content: '';
@@ -2819,13 +2901,16 @@ th {
 .importBlockContainer {
   color: #596875;
 }
+/******************************************* 
+************* Social Buttons *************** 
+********************************************/
 .btn-block + .btn-block {
   margin-top: 5px;
 }
 .btn-google-plus {
   color: #FFFFFF !important;
   background-color: #DD4B39;
-  border-color: rgba(0,0,0,0.2);
+  border-color: rgba(0, 0, 0, 0.2);
 }
 .btn-social {
   position: relative;
@@ -2844,15 +2929,18 @@ th {
   line-height: 34px;
   font-size: 1.6em;
   text-align: center;
-  border-right: 1px solid rgba(0,0,0,0.2);
+  border-right: 1px solid rgba(0, 0, 0, 0.2);
 }
+/******************************************* 
+************* Updates Timeline *************** 
+********************************************/
 .recentActivitiesContainer .history {
   margin: 0 auto;
   padding: 20px 20px 1px;
   max-width: 100%;
   overflow-x: visible;
-  -webkit-transition: opacity .2s ease-out;
-  transition: opacity .2s ease-out;
+  -webkit-transition: opacity 0.2s ease-out;
+  transition: opacity 0.2s ease-out;
 }
 .updates_timeline {
   padding-top: 20px;
@@ -2861,6 +2949,7 @@ th {
   padding: 0;
   list-style: none;
 }
+/* The line */
 .updates_timeline:before {
   content: '';
   position: absolute;
@@ -2879,6 +2968,7 @@ th {
   min-height: 40px;
   z-index: 2;
 }
+/* Left Content(Time) */
 .updates_timeline > li .update_time {
   position: absolute;
   margin: 0;
@@ -2890,6 +2980,7 @@ th {
   font-size: 15px;
   font-style: italic;
 }
+/* Right content(Update info) */
 .updates_timeline > li .update_info {
   padding: 10px 10px 1px;
   display: block;
@@ -2898,10 +2989,11 @@ th {
   position: relative;
   top: -45px;
 }
-.updates_timeline > li .update_info >h3 {
+.updates_timeline > li .update_info > h3 {
   font-size: 1.1em;
   margin-left: -3%;
 }
+/* The icons  */
 .updates_timeline > li .update_icon {
   position: relative;
   border-radius: 50%;
@@ -2914,6 +3006,7 @@ th {
   color: #fff;
   line-height: 35px;
 }
+/* More Button */
 .updates_timeline #more_button .update_icon {
   position: relative;
   border-radius: 0;
@@ -3021,6 +3114,9 @@ th {
   vertical-align: super;
   font-size: 13px;
 }
+/******************************************* 
+************* Task Management ************** 
+********************************************/
 #taskManagementContainer .data-body {
   margin-bottom: 50px;
 }
@@ -3083,15 +3179,16 @@ th {
 #taskManagementContainer .other-details {
   color: #979797;
 }
+/*overwriting jquery ui css*/
 .ui-menu {
   z-index: 10000;
 }
 #taskManagementContainer button.active {
   background: #3B83F7;
   color: white;
-  text-shadow: 0 1px rgba(0,0,0,0.3);
+  text-shadow: 0 1px rgba(0, 0, 0, 0.3);
   border: 1px solid #135fd7;
-  box-shadow: inset 0 1px 2px rgba(0,0,0,0.3);
+  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.3);
 }
 .taskSubject {
   width: 99%;
@@ -3099,6 +3196,9 @@ th {
 #taskManagementContainer .mCustomScrollbar .mCSB_inside > .mCSB_container {
   margin-right: 13px;
 }
+/******************************************* 
+************* Settings Page ************** 
+********************************************/
 .settingsPageDiv.content-area {
   margin-right: 0;
 }
@@ -3132,6 +3232,9 @@ th {
 .settingsgroup-accordion a i {
   margin-right: 5px;
 }
+.settingsgroup-accordion a span {
+  text-transform: uppercase;
+}
 .settingsgroup {
   background: #2C3B49;
   height: 100%;
@@ -3288,35 +3391,59 @@ th {
 }
 .mini-slider-control[data-value="0"] .ui-slider-handle {
   background: #7d7e7d;
-  background: -moz-linear-gradient(top,#7d7e7d 0%,#0e0e0e 100%);
-  background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#7d7e7d),color-stop(100%,#0e0e0e));
-  background: -webkit-linear-gradient(top,#7d7e7d 0%,#0e0e0e 100%);
-  background: -o-linear-gradient(top,#7d7e7d 0%,#0e0e0e 100%);
-  background: -ms-linear-gradient(top,#7d7e7d 0%,#0e0e0e 100%);
-  background: linear-gradient(to bottom,#7d7e7d 0%,#0e0e0e 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#7d7e7d',endColorstr='#0e0e0e',GradientType=0);
+  /* Old browsers */
+  background: -moz-linear-gradient(top, #7d7e7d 0%, #0e0e0e 100%);
+  /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #7d7e7d), color-stop(100%, #0e0e0e));
+  /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #7d7e7d 0%, #0e0e0e 100%);
+  /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top, #7d7e7d 0%, #0e0e0e 100%);
+  /* Opera 11.10+ */
+  background: -ms-linear-gradient(top, #7d7e7d 0%, #0e0e0e 100%);
+  /* IE10+ */
+  background: linear-gradient(to bottom, #7d7e7d 0%, #0e0e0e 100%);
+  /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#7d7e7d', endColorstr='#0e0e0e', GradientType=0);
+  /* IE6-9 */
   margin-left: 0px;
 }
 .mini-slider-control[data-value="1"] .ui-slider-handle {
   background: #ffb76b;
-  background: -moz-linear-gradient(top,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#ffb76b),color-stop(0%,#ffa73d),color-stop(49%,#ff7c00),color-stop(100%,#ff7f04));
-  background: -webkit-linear-gradient(top,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  background: -o-linear-gradient(top,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  background: -ms-linear-gradient(top,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  background: linear-gradient(to bottom,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffb76b',endColorstr='#ff7f04',GradientType=0);
+  /* Old browsers */
+  background: -moz-linear-gradient(top, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffb76b), color-stop(0%, #ffa73d), color-stop(49%, #ff7c00), color-stop(100%, #ff7f04));
+  /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* Opera 11.10+ */
+  background: -ms-linear-gradient(top, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* IE10+ */
+  background: linear-gradient(to bottom, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffb76b', endColorstr='#ff7f04', GradientType=0);
+  /* IE6-9 */
   margin-left: -6px;
 }
 .mini-slider-control[data-value="2"] .ui-slider-handle {
   background: #bfd255;
-  background: -moz-linear-gradient(top,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#bfd255),color-stop(79%,#8eb92a),color-stop(100%,#72aa00),color-stop(100%,#9ecb2d));
-  background: -webkit-linear-gradient(top,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  background: -o-linear-gradient(top,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  background: -ms-linear-gradient(top,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  background: linear-gradient(to bottom,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bfd255',endColorstr='#9ecb2d',GradientType=0);
+  /* Old browsers */
+  background: -moz-linear-gradient(top, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #bfd255), color-stop(79%, #8eb92a), color-stop(100%, #72aa00), color-stop(100%, #9ecb2d));
+  /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* Opera 11.10+ */
+  background: -ms-linear-gradient(top, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* IE10+ */
+  background: linear-gradient(to bottom, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bfd255', endColorstr='#9ecb2d', GradientType=0);
+  /* IE6-9 */
   margin-left: -13px;
 }
 .ModulemanagerSettings .moduleblock .hiden {
@@ -3341,10 +3468,13 @@ th {
 th {
   padding: 6px;
 }
+/******************************************* 
+********** CustomerPortal styles start ********
+********************************************/
 .cp-tabs .enabledModules {
   display: inline-block ! important;
-  margin-left: 4px !important;
-  margin-right: 4px !important;
+  margin-left: 4px!important;
+  margin-right: 4px!important;
   vertical-align: top;
 }
 .drag-portal-module {
@@ -3451,7 +3581,7 @@ th {
   margin-left: 5px;
 }
 .portal-field-delete {
-  margin-left: 45px !important;
+  margin-left: 45px!important;
 }
 .portalModuleRow {
   border-left: 4px solid #3CB878 !important;
@@ -3468,7 +3598,7 @@ th {
   content: "*";
   color: red;
 }
-.nav-tabs .cp-modules > .active >a,
+.nav-tabs .cp-modules > .active > a,
 .nav-tabs .cp-modules > .active > a:hover {
   border: 0px !important;
   border-top-right-radius: 0px;
@@ -3630,7 +3760,7 @@ th {
   display: inline-block;
 }
 .quickPreview .updates_timeline:before {
-  background: #e6e6e6;
+  background: #e5e5e5;
   width: 2px;
   margin-left: -1%;
 }
@@ -3645,13 +3775,16 @@ th {
 .quickPreviewComments .recentComments .commentDetails .comment {
   line-height: 15px;
 }
-.quickPreviewComments  .summaryWidgetContainer {
+.quickPreviewComments .summaryWidgetContainer {
   border: 0;
   padding: 0;
 }
 .quickPreview .recentActivitiesContainer .history {
   padding: 0;
 }
+/******************************************* 
+********** Calendar view styles ************
+********************************************/
 .calendar-sidebar {
   width: 100% !important;
 }
@@ -3808,6 +3941,11 @@ th {
   display: inline-block;
   text-align: center;
 }
+/******************************************* 
+********** Calendar view styles end ********
+
+********** Documents Module styles *********
+********************************************/
 .dragdrop-dotted {
   border: 2px dashed #C0C0C0;
   min-width: 300px;
@@ -3867,13 +4005,16 @@ tr.file > td.fileOwnerData {
   width: 100px;
   white-space: pre-wrap;
 }
+/******************************************* 
+********** Documents Module styles end *****
+********************************************/
 .engagementsContainer .engagements_content {
   padding-top: 15px;
 }
 .summaryWidgetContainer .engagementsContainer table {
   width: inherit;
 }
-.engagements_content table thead>tr:first-child {
+.engagements_content table thead > tr:first-child {
   border: 1px solid #CCC;
   background-color: #F5F5F5;
 }
@@ -3924,6 +4065,9 @@ tr.file > td.fileOwnerData {
   font-size: 15px;
   padding: 1% 0;
 }
+/******************************************* 
+********** Mailroom view styles start ********
+********************************************/
 .mailroomBanner {
   margin: 23px 0;
   height: 215px;
@@ -4132,6 +4276,7 @@ tr.file > td.fileOwnerData {
   margin-left: 0;
 }
 .mentionMessages .mention_follow_up {
+  /*//load this color from variable.less*/
   background-color: green;
 }
 .modelContainer .modal-content {
@@ -4280,6 +4425,7 @@ form[name="notification_settings"] .select2-choice {
   margin-left: 0;
 }
 .mentionMessages .mention_follow_up {
+  /*//load this color from variable.less*/
   background-color: green;
 }
 .modal-content .mention_followup .row {
@@ -4311,6 +4457,9 @@ form[name="notification_settings"] .select2-choice {
 .mentionMessageHeader .MultiFile-remove {
   color: #FFFFFF;
 }
+/******************************************* 
+********** Mailroom view styles end ********
+********************************************/
 .detailview-header {
   margin-bottom: 10px;
 }
@@ -4326,6 +4475,7 @@ form[name="notification_settings"] .select2-choice {
   margin: 0px 10px;
   text-decoration: underline !important;
   color: #3498DB;
+  /*font-size : 12px;*/
 }
 .tag {
   display: inline-block;
@@ -4409,11 +4559,10 @@ form[name="notification_settings"] .select2-choice {
   border: 1px solid #dcdcdc;
 }
 #tagCloud .tag {
-  color: #5ea9dd;
-  padding: 0px;
   background-color: #FFFFFF;
   border-color: #FFFFFF;
   border-radius: 0px;
+  color: #5ea9dd;
   margin: 3px;
 }
 #tagCloud .tag[data-type="public"] {
@@ -4424,6 +4573,9 @@ form[name="notification_settings"] .select2-choice {
   max-width: 80px;
   vertical-align: bottom;
 }
+/******************************************* 
+********** Groups view styles ********
+********************************************/
 #s2id_memberList li > div,
 .groupMembersColors li > div {
   margin-left: 10px;
@@ -4498,6 +4650,12 @@ form[name="notification_settings"] .select2-choice {
   margin: 0px;
   color: #444444;
 }
+/******************************************* 
+********** Groups view styles  ends********
+********************************************/
+/******************************************* 
+********** Picklist Css ********
+********************************************/
 .pickListValue {
   background-color: #FFFFFF;
 }
@@ -4512,6 +4670,12 @@ form[name="notification_settings"] .select2-choice {
   padding: 2px 1px !important;
   line-height: 15px;
 }
+/******************************************* 
+************* Dashboard Styles *************
+********************************************/
+li.dashboardWidget {
+  overflow: auto;
+}
 .dashboardWidgetHeader .title {
   padding-bottom: 10px;
   font-size: 15px;
@@ -4532,9 +4696,6 @@ form[name="notification_settings"] .select2-choice {
 .dashBoardContainer .tabContainer .tab-content {
   margin-top: 10px;
 }
-.dashBoardContainer .dashBoardTabContents ul {
-  margin: 0;
-}
 .dashBoardContainer .dashBoardTabContents ul li {
   border: 3px solid #E2E2E4;
   box-shadow: 1px;
@@ -4601,7 +4762,7 @@ form[name="notification_settings"] .select2-choice {
   display: inline-block;
   opacity: 1;
 }
-.dashBoardContainer .tabContainer li a  .deleteTab:hover {
+.dashBoardContainer .tabContainer li a .deleteTab:hover {
   cursor: pointer;
 }
 #minilistWizardContainer .fieldLabel {
@@ -4638,6 +4799,9 @@ form[name="notification_settings"] .select2-choice {
   resize: none;
   width: 100%;
 }
+/******************************************* 
+********** Picklist DependencyGraph ********
+********************************************/
 #dependencyGraph .tableHeading {
   text-align: center;
   padding-top: 30px;
@@ -4663,12 +4827,15 @@ form[name="notification_settings"] .select2-choice {
 #dependencyGraph .dependencyMapping .pickListDependencyTable .selectedCell {
   background: #a9cbf5;
 }
+/******************************************* 
+********** Rewriting select2 for consistency********
+********************************************/
 .select2-container .select2-choice {
   height: 29px;
   border-radius: 1px;
 }
 .modal {
-  z-index: 1100;
+  z-index: 1070;
 }
 .select2-container .select2-choice {
   height: 28px;
@@ -4756,6 +4923,7 @@ hr {
   position: fixed;
   bottom: 0;
   background: #EFEFEF;
+  /*width:100%;*/
   border-left: 42px solid #2c3b49;
   height: 60px;
   left: 0;
@@ -4774,7 +4942,6 @@ hr {
 }
 .settingsPageDiv .modal-overlay-footer {
   margin-left: 230px;
-  border-left: 0px solid;
 }
 .settingsOverlayContainer .modal-overlay-footer {
   margin: 0;
@@ -4797,14 +4964,14 @@ hr {
   vertical-align: middle;
   margin-top: 6px;
 }
-.list-menu-content .pull-right>.dropdown-menu {
+.list-menu-content .pull-right > .dropdown-menu {
   left: -126px;
   position: relative;
 }
-.dropdown-menu>li>a {
+.dropdown-menu > li > a {
   padding: 4px 6px;
 }
-.dropdown-menu>li>a span i {
+.dropdown-menu > li > a span i {
   font-size: 15px;
   vertical-align: middle;
 }
@@ -4812,11 +4979,11 @@ hr {
   max-height: 300px;
   padding-left: 0;
 }
-.related-tabs .dropdown-menu>.mCustomScrollBox>.mCSB_container {
+.related-tabs .dropdown-menu > .mCustomScrollBox > .mCSB_container {
   margin-right: 0;
   padding: 4px 6px;
 }
-.related-tabs .dropdown-menu>.mCustomScrollBox>.mCSB_container>li>a {
+.related-tabs .dropdown-menu > .mCustomScrollBox > .mCSB_container > li > a {
   display: block;
   padding: 3px 5px;
   clear: both;
@@ -4825,7 +4992,7 @@ hr {
   color: #333;
   white-space: nowrap;
 }
-.related-tabs .dropdown-menu>.mCustomScrollBox>.mCSB_container span i {
+.related-tabs .dropdown-menu > .mCustomScrollBox > .mCSB_container span i {
   font-size: 15px;
   vertical-align: middle;
 }
@@ -4848,16 +5015,16 @@ hr {
 .calendar-sidebar .calendar-sidebar-tabs.padding {
   padding-left: 20px !important;
 }
-.related-tabs.row .nav>li {
+.related-tabs.row .nav > li {
   padding: 0 10px;
   margin: 0 2px;
 }
-.massEditTabs.nav>li {
+.massEditTabs.nav > li {
   padding: 0 10px;
   margin: 0 4px;
 }
-.row .nav>li>a,
-.row .nav>li>a:hover {
+.row .nav > li > a,
+.row .nav > li > a:hover {
   padding: 10px 3px;
   border: none;
   vertical-align: bottom;
@@ -4867,38 +5034,39 @@ hr {
   -webkit-box-sizing: border-box;
   -o-box-sizing: border-box;
 }
-.row .nav>li>a:hover {
+.row .nav > li > a:hover {
   border-bottom-color: #555;
 }
-TN-34230
-
-.row .nav>li>a:hover {
+/*.row ul{
+    padding:0;
+}*/
+TN-34230 .row .nav > li > a:hover {
   border-bottom-color: #555;
   background: none;
 }
 .row ul li:first-child {
   margin-left: 0;
 }
-.related-tabs .nav-tabs>li.active,
-.related-tabs .nav-tabs>li:hover,
-.related-tabs .nav-tabs>li.active:focus,
-.dashBoardContainer .nav-tabs>li.active,
-.dashBoardContainer .nav-tabs>li:hover,
-.dashBoardContainer .nav-tabs>li.active:focus,
-.contents.tabbable .nav-tabs>li.active,
-.contents.tabbable .nav-tabs>li:hover,
-.contents.tabbable .nav-tabs>li.active:focus {
+.related-tabs .nav-tabs > li.active,
+.dashBoardContainer .nav-tabs > li.active,
+.contents.tabbable .nav-tabs > li.active,
+.related-tabs .nav-tabs > li:hover,
+.dashBoardContainer .nav-tabs > li:hover,
+.contents.tabbable .nav-tabs > li:hover,
+.related-tabs .nav-tabs > li.active:focus,
+.dashBoardContainer .nav-tabs > li.active:focus,
+.contents.tabbable .nav-tabs > li.active:focus {
   border: none;
   border-bottom: 3px solid #555;
 }
-.nav-tabs>li.active>a,
-.nav-tabs>li.active>a:hover,
-.nav-tabs>li.active>a:focus,
-.nav-tabs>li>a {
+.nav-tabs > li.active > a,
+.nav-tabs > li.active > a:hover,
+.nav-tabs > li.active > a:focus,
+.nav-tabs > li > a {
   border: 0;
 }
-.nav>li>a:hover,
-.nav>li>a:focus {
+.nav > li > a:hover,
+.nav > li > a:focus {
   background-color: #FFFFFF;
 }
 .fa-pencil,
@@ -4908,6 +5076,9 @@ TN-34230
 .commentAttachmentName {
   font-size: 11px;
 }
+/******************************************* 
+********** Layout Editor ********
+********************************************/
 .marginBottom10px {
   margin-bottom: 10px;
 }
@@ -4930,6 +5101,7 @@ TN-34230
 }
 .zeroOpacity {
   opacity: 0;
+  /*for IE*/
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
   filter: alpha(opacity=0);
 }
@@ -4956,10 +5128,12 @@ TN-34230
 .layoutContent .opacity:hover .actions {
   opacity: 1;
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
+  /*for IE*/
   filter: alpha(opacity=100);
 }
 .layoutContent .fieldPropertyContainer:hover .actions {
   opacity: 1;
+  /*for IE*/
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
   filter: alpha(opacity=100);
 }
@@ -4982,6 +5156,7 @@ TN-34230
 .relatedTabModulesList .addButton {
   border-radius: 2px;
   border: 1px solid #DDDDDD;
+  text-transform: uppercase;
   color: #666666;
   background: #FFFFFF;
 }
@@ -5055,6 +5230,9 @@ TN-34230
   margin-left: 5px;
   word-break: break-all;
 }
+/******************************************* 
+************** Tax Management **************
+********************************************/
 #TaxCalculationsContainer .table tr:first-child,
 .taxModalContainer #editTax .table tr:first-child {
   border-bottom: 1px solid #ccc;
@@ -5094,6 +5272,9 @@ TN-34230
   max-height: 500px;
   overflow-y: auto;
 }
+/******************************************* 
+********** Workflows ********
+********************************************/
 #workflow_edit .editViewBody {
   overflow: inherit;
 }
@@ -5103,7 +5284,7 @@ TN-34230
 }
 .timePicker {
   width: 9.5em !important;
-  z-index: 1101 !important;
+  z-index: 1070 !important;
 }
 .weekDaySelect .ui-state-default {
   background: inherit;
@@ -5141,75 +5322,6 @@ TN-34230
 .module-filters.active {
   background: #F7F7F7;
 }
-.payment-type-selection {
-  margin-bottom: 30px;
-}
-.payment-type-selection img {
-  vertical-align: middle;
-}
-.currplan {
-  padding: 10px 20px;
-  background-color: #f3f3f3;
-  border: 1px solid #eee;
-  border-radius: 3px;
-}
-.currplan div {
-  display: inline-block;
-  font-size: 16px;
-}
-.planName {
-  display: inline-block;
-  color: #fff;
-  padding: 20px;
-  margin: 10px 20px;
-  font-size: 24px;
-  border-radius: 2px;
-}
-.plan-heading {
-  min-height: 168px;
-}
-.plan-title {
-  color: #fff;
-  font-size: 20px;
-  padding: 13px 0;
-}
-#sales_plan {
-  background: #3FC380;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#salespremium_plan {
-  background: #00B16A;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#support_plan {
-  background: #2980B9;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#supportpremium_plan {
-  background: #2980B9;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#ultimate_plan,
-#exclusive_plan {
-  background: #F39C12;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#contact_plan {
-  background: #FF5959;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
 .workflowListContainer .select2-container .select2-choice {
   height: 36px;
 }
@@ -5224,6 +5336,7 @@ TN-34230
 .contactAdd {
   border: 1px solid #eee;
   padding: 20px;
+  /*min-height: 310px !important;*/
 }
 #subDetails table td {
   padding: 7px 10px;
@@ -5346,9 +5459,9 @@ TN-34230
 .productBundles {
   padding-left: 20px;
 }
-.nav .open>a,
-.nav .open>a:hover,
-.nav .open>a:focus {
+.nav .open > a,
+.nav .open > a:hover,
+.nav .open > a:focus {
   color: #000000;
   background-color: #FFFFFF;
 }
@@ -5369,6 +5482,9 @@ TN-34230
   width: 100%;
   overflow-x: auto;
 }
+/******************************************* 
+*************** Mail Manager ***************
+********************************************/
 #mm_searchButton {
   height: 28px;
   background-color: #FFFFFF;
@@ -5424,8 +5540,8 @@ TN-34230
   padding: 1px 5px;
   border-radius: 3px;
   text-align: center;
-  text-shadow: 0 1px rgba(0,0,0,0.1);
-  background-image: -webkit-linear-gradient(top,#DD4B39 0,#D14836 100%);
+  text-shadow: 0 1px rgba(0, 0, 0, 0.1);
+  background-image: -webkit-linear-gradient(top, #DD4B39 0, #D14836 100%);
   border: 1px solid #C6322A;
   background-color: #DD4B39;
 }
@@ -5643,6 +5759,7 @@ TN-34230
 .width40per {
   width: 40%;
 }
+/****** Mail Manager Ends ******/
 .quickCreateContent .massEditTable textarea,
 .addCommentBlock .commentTextArea textarea {
   resize: vertical;
@@ -5655,19 +5772,20 @@ TN-34230
 .select2-container-multi .select2-choices {
   z-index: 1;
 }
-.nav .nav-stacks .cp-nav-header-wrapper>li.disabled>a:hover {
+/****** Customer Portal Settings ******/
+.nav .nav-stacks .cp-nav-header-wrapper > li.disabled > a:hover {
   background-color: #fff;
 }
-.cp-nav-header-wrapper>li.disabled>a:hover {
+.cp-nav-header-wrapper > li.disabled > a:hover {
   border: 0px ! important;
 }
-.nav .nav-stacks .cp-nav-header-wrapper>li.disabled>a {
+.nav .nav-stacks .cp-nav-header-wrapper > li.disabled > a {
   background-color: #fff;
 }
-#portalModulesTable>li.portalModuleRow.active>a:hover {
+#portalModulesTable > li.portalModuleRow.active > a:hover {
   background-color: #fff !important;
 }
-#portalModulesTable>li.portalModuleRow.active>a:focus {
+#portalModulesTable > li.portalModuleRow.active > a:focus {
   background-color: #fff !important;
 }
 .portal-dashboard {
@@ -5766,7 +5884,7 @@ TN-34230
 .portal-dashboard {
   border-bottom: 0px ! important;
 }
-#portal-shortcutsContainer>ul {
+#portal-shortcutsContainer > ul {
   border-bottom: 0px ! important;
 }
 .portalMenuHeader {
@@ -5775,14 +5893,15 @@ TN-34230
 }
 .cp-tabs .enabledModules {
   display: inline-block ! important;
-  margin-left: 4px !important;
-  margin-right: 4px !important;
+  margin-left: 4px!important;
+  margin-right: 4px!important;
   vertical-align: top;
   margin-top: 4px !important;
 }
 .portal-shortcut-list:hover {
   border-bottom: 3px solid transparent ! important;
 }
+/****** Customer Portal Settings ******/
 .label-radio label input[type="radio"] {
   position: relative;
   top: 2px;
@@ -5794,6 +5913,9 @@ TN-34230
 div.tooltip-inner {
   max-width: 400px;
 }
+/******************************************* 
+********** Menu Editor ********
+********************************************/
 .sortable.appContainer.ui-sortable {
   width: 160px;
 }
@@ -5968,7 +6090,7 @@ div.tooltip-inner {
   width: 13px !important;
   margin-top: 8px;
 }
-.detailview-table .input-group-addon+.inputElement.form-control,
+.detailview-table .input-group-addon + .inputElement.form-control,
 .detailview-table .inputElement.form-control.input-medium {
   width: 100%;
 }
@@ -6015,6 +6137,7 @@ div.tooltip-inner {
   float: left;
   margin-right: 5px;
 }
+/***** Oursites Changes *****/
 .portal-table .table-actions {
   width: inherit ! important;
 }
@@ -6026,6 +6149,7 @@ div.tooltip-inner {
   padding: 10px 5px ! important;
   padding-left: 10px ! important;
 }
+/***** Oursites Changes *****/
 .ExtensionscontentsDiv .content-area {
   padding-left: 15px;
   padding-right: 15px;
@@ -6039,14 +6163,14 @@ div.tooltip-inner {
 }
 .blockHeader {
   border-color: #F3F3F4 #F3F3F4 #cbcbcf;
-  border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
   background-color: #474747;
-  background-image: -moz-linear-gradient(top,#555555,#333333);
-  background-image: -ms-linear-gradient(top,#555555,#333333);
-  background-image: -webkit-gradient(linear,0 0,0 100%,from(#555555),to(#333333));
-  background-image: -webkit-linear-gradient(top,#555555,#333333);
-  background-image: -o-linear-gradient(top,#555555,#333333);
-  background-image: linear-gradient(top,#555555,#333333);
+  background-image: -moz-linear-gradient(top, #555555, #333333);
+  background-image: -ms-linear-gradient(top, #555555, #333333);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#333333));
+  background-image: -webkit-linear-gradient(top, #555555, #333333);
+  background-image: -o-linear-gradient(top, #555555, #333333);
+  background-image: linear-gradient(top, #555555, #333333);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#333333', GradientType=0);
   min-height: 30px;
@@ -6139,8 +6263,8 @@ div.tooltip-inner {
 .markStar .starredStatus {
   display: none;
 }
-.nav>li.addDashboardTab>a,
-.nav>li.addDashboardTab>a:hover {
+.nav > li.addDashboardTab > a,
+.nav > li.addDashboardTab > a:hover {
   padding: 10px 15px;
   background: inherit;
 }
@@ -6153,7 +6277,7 @@ div.tooltip-inner {
   height: 960px;
   width: 1260px;
 }
-.nav-tabs>li {
+.nav-tabs > li {
   border-bottom: 3px solid transparent;
   margin: 0 2px;
 }
@@ -6231,16 +6355,14 @@ div.tooltip-inner {
 }
 .select2-container.select2-container-multi.select2,
 .editViewPageDiv .select2-container.select2-container-multi.select2 {
-  height: auto !important;
+  height: auto!important;
 }
-.summaryViewFields .select2-container-multi.inputElement.form-control
-.quickCreateContent .select2-container.select2-container-multi.select2,
+.summaryViewFields .select2-container-multi.inputElement.form-control .quickCreateContent .select2-container.select2-container-multi.select2,
 #massEditContainer .select2-container.select2-container-multi.select2 {
   width: 150px;
   height: auto !important;
 }
-.summaryViewFields .select2-container-multi.inputElement.form-control
-.quickCreateContent .select2-container.select2-container-multi.select2 .input-save-wrap,
+.summaryViewFields .select2-container-multi.inputElement.form-control .quickCreateContent .select2-container.select2-container-multi.select2 .input-save-wrap,
 #massEditContainer .select2-container.select2-container-multi.select2 .input-save-wrap {
   float: right;
   margin-right: 25px;
@@ -6336,6 +6458,7 @@ a.cp-modules:hover {
 #RestrictionsLayout {
   background: #fafafb;
   margin-top: -92px;
+  /*to adjust with page padding top*/
 }
 #RestrictionsLayout .vtImage {
   width: 22%;
@@ -6369,6 +6492,7 @@ a.cp-modules:hover {
 .datepicker {
   z-index: 1100 !important;
 }
+/*****RSS Changes****/
 .feedListContainer .listview-table tr td:first-child,
 .listview-table tr th:first-child {
   width: inherit ! important;
@@ -6376,12 +6500,14 @@ a.cp-modules:hover {
 .feedListContainer .listViewEntries .listViewEntryValue {
   max-width: inherit ! important;
 }
-.ps-container>.ps-scrollbar-y-rail {
+/*****RSS Changes****/
+.ps-container > .ps-scrollbar-y-rail {
   z-index: 1002;
 }
 #relationBlock .recordScroll {
   max-height: 150px;
 }
+/*Start - List sidebar toggle*/
 .essentials-toggle {
   background-color: white;
   font-weight: bold;
@@ -6401,6 +6527,7 @@ a.cp-modules:hover {
 .essentials-toggle .fa-chevron-right {
   background-position: -460px -72px !important;
 }
+/*End - List essentials toggle*/
 .module-name-tooltip .qtip-content {
   font-size: 12px;
   padding: 3px;
@@ -6484,8 +6611,8 @@ li.select2-search-choice div {
 .popover ul.listmenu li {
   padding: 3px;
 }
-.popover-content .disabled>a,
-.popover .disabled>a {
+.popover-content .disabled > a,
+.popover .disabled > a {
   opacity: 0.5;
   cursor: not-allowed;
 }
@@ -6496,6 +6623,7 @@ li.select2-search-choice div {
   -o-transform: rotate(180deg);
   transform: rotate(180deg);
 }
+/*Start - List sidebar toggle*/
 .essentials-toggle {
   background-color: white;
   font-weight: bold;
@@ -6515,6 +6643,7 @@ li.select2-search-choice div {
 .essentials-toggle .fa-chevron-right {
   background-position: -460px -72px !important;
 }
+/*End - List essentials toggle*/
 .module-name-tooltip .qtip-content {
   font-size: 12px;
   padding: 3px;
@@ -6595,16 +6724,16 @@ li.select2-search-choice div {
 #reportDetails .pivot .toptitle.targetY0,
 #reportDetails .pivot .lefttitle.targetX0 {
   border-color: #F3F3F4 #F3F3F4 #cbcbcf;
-  border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
   background-color: #474747;
-  background-image: -moz-linear-gradient(top,#555555,#333333);
-  background-image: -ms-linear-gradient(top,#555555,#333333);
-  background-image: -webkit-gradient(linear,0 0,0 100%,from(#555555),to(#333333));
-  background-image: -webkit-linear-gradient(top,#555555,#333333);
-  background-image: -o-linear-gradient(top,#555555,#333333);
-  background-image: linear-gradient(top,#555555,#333333);
+  background-image: -moz-linear-gradient(top, #555555, #333333);
+  background-image: -ms-linear-gradient(top, #555555, #333333);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#333333));
+  background-image: -webkit-linear-gradient(top, #555555, #333333);
+  background-image: -o-linear-gradient(top, #555555, #333333);
+  background-image: linear-gradient(top, #555555, #333333);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555',endColorstr='#333333',GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#333333', GradientType=0);
   min-height: 30px;
 }
 #reportDetails .pivot th.toptitle.targetY0,
@@ -6646,7 +6775,8 @@ li.select2-search-choice div {
   background: #FFFFFF;
 }
 .templateActions {
-  background: rgba(0,0,0,0.1);
+  background: rgba(0, 0, 0, 0.1);
+  /*padding: 4%;*/
   bottom: 0;
   text-align: center;
   position: absolute;
@@ -6654,6 +6784,9 @@ li.select2-search-choice div {
   zoom: 1;
   width: 100%;
 }
+/*.templateActions i {
+    margin-right: 30px;
+}*/
 .thumbnails > li {
   float: left;
   height: 315px !important;
@@ -6828,9 +6961,10 @@ a.btnReport:hover {
   left: 0px;
 }
 .bx-wrapper .bx-viewport {
-  width:99%;
+  width: 99%;
   left: 0px;
   background: #fff;
+  /*fix other elements on the page moving (on Chrome)*/
   -webkit-transform: translatez(0);
   -moz-transform: translatez(0);
   -ms-transform: translatez(0);
@@ -6888,7 +7022,7 @@ a.btnReport:hover {
 .filter-search-show {
   display: block !important;
 }
-.emailTemplatesPopupTableContainer .listViewEntries  .listViewEntryValue {
+.emailTemplatesPopupTableContainer .listViewEntries .listViewEntryValue {
   max-width: 100%;
   min-width: 150px;
 }
@@ -6923,12 +7057,15 @@ input:focus::-webkit-input-placeholder {
 input:focus:-moz-placeholder {
   color: transparent;
 }
+/* FF 4-18 */
 input:focus::-moz-placeholder {
   color: transparent;
 }
+/* FF 19+ */
 input:focus:-ms-input-placeholder {
   color: transparent;
 }
+/* IE 10+ */
 .global-actions .dropdown-menu:before {
   position: absolute;
   top: -7px;
@@ -6937,7 +7074,7 @@ input:focus:-ms-input-placeholder {
   border-right: 7px solid transparent;
   border-bottom: 7px solid #ccc;
   border-left: 7px solid transparent;
-  border-bottom-color: rgba(0,0,0,0.2);
+  border-bottom-color: rgba(0, 0, 0, 0.2);
   content: '';
 }
 .global-actions .dropdown-menu:after {
@@ -7122,6 +7259,7 @@ input:focus:-ms-input-placeholder {
   text-align: center;
 }
 #OnBoardLayout #OnBoardPageContainer .crmGoals textarea::-webkit-input-placeholder {
+  /* WebKit browsers */
   text-align: center;
   padding: 20%;
   font-size: 12px;
@@ -7267,121 +7405,3 @@ input:focus:-ms-input-placeholder {
   border-left: 3px solid #3CB878;
   opacity: 1;
 }
-.fieldValue .value a {
-  color: #15c !important;
-}
-.editViewContents .fieldLabel {
-  min-width: 100px;
-  width: 20%;
-  word-break: break-all;
-}
-.editViewContents .fieldValue {
-  width:30%;
-}
-.editViewContents td.fieldValue[colspan="3"] {
-  width:80%;
-}
-.editViewContents textarea.textAreaElement {
-  width: 88%;
-}
-.editViewContents input[type="checkbox"] {
-  width: 15px;
-  height: 15px;
-}
-.editViewContents input[type="radio"] {
-  width: 15px;
-  height: 15px;
-}
-#composeEmailContainer .modal-body .quickCreateContent,
-#QuickCreate .modal-body .quickCreateContent,
-#create .quickCreateContent {
-  margin-top: 25px;
-}
-.settingsgroup-panel .widgetContainer .menuItemLabel .pinUnpinShortCut {
-  display: none;
-  margin-top: 2px;
-}
-.settingsgroup-panel .widgetContainer .menuItemLabel:hover .pinUnpinShortCut {
-  display: inline-block;
-}
-@-moz-document url-prefix() {
-  .duplicateHandlingContainer .tooltip-inner {
-    width: 550px;
-    max-width: 550px;
-  }
-}
-.duplicateHandlingContainer .tooltip-inner {
-  text-align: left !important;
-}
-.duplicateHandlingContainer .syncMessage {
-  margin-top: 5px !important;
-}
-.duplicateHandlingContainer .actionsList {
-  width: 230px !important;
-}
-.duplicationMessageContainer {
-  background-color: #f2dede !important;
-  color: #b94a48 !important;
-}
-.duplicationMessageContainer .duplicationMessageHeader {
-  margin-bottom: 8px;
-}
-.listViewRecordActions .quickView, .listViewRecordActions .markStar,
-.listViewRecordActions .markAsHeld,.listViewRecordActions .holdFollowupOn {
-  margin-top: 4px;
-}
-.app-menu .module-icon .custom-module {
-	font-size: 14px;
-	border-radius: 4px;
-	color: #000;
-	background-color: #fff;
-	padding: 4px 10px 4px 5px !important
-}
-.menu-item .custom-module {
-	font-family: 'OpenSans-Regular', sans-serif;
-	font-size: 12px;
-	border-radius: 4px;
-	padding: 2px;
-	color: #000;
-	background-color: #fff;
-}
-.modules-menu .custom-module {
-	color: #fff;
-	margin-left: 0px;
-	display: inline;
-	border: 1px solid #fff;
-	border-radius: 4px;
-	padding: 3px 4px 3px 2px !important;
-	font-weight: bold;
-}
-#quickCreateModules .custom-module, .workflowListContainer .custom-module, .dashBoardTabContents .custom-module {
-	border-radius: 4px;
-	padding: 3px 5px;
-	color: #fff;
-	background-color: #777;
-}
-.menuEditorItem .custom-module {
-	border-radius: 4px;
-	padding: 3px 5px;
-	color: #000;
-	background-color: #fff;
-}
-.task-details .custom-module {
-	border-radius: 4px;
-	padding: 1px 4px;
-	color: white;
-	background-color: #777;
-}
-.related-tabs .custom-module, #relatedmenuList .custom-module {
-	border-radius: 4px;
-	color: #fff;
-	background-color: #777;
-	padding: 5px 7px;
-	font-weight: bold;
-}
-.record-header .custom-module {
-	font-size: 30px;
-}
-.moduleIcon .custom-module {
-	font-weight: bold;
-}
\ No newline at end of file
diff --git a/layouts/v7/skins/support/style.css b/layouts/v7/skins/support/style.css
index debe4b5fe24f303a5cb5c4496f639fafc359c4a0..53e6b4855bc4013e36c1a4862ea544a34646e8e0 100644
--- a/layouts/v7/skins/support/style.css
+++ b/layouts/v7/skins/support/style.css
@@ -1,7 +1,9 @@
 @font-face {
   font-family: 'Oswald';
   src: url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.eot');
-  src: url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.eot?#iefix') format('embedded-opentype'), url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.woff') format('woff'), url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.ttf') format('truetype'), url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.svg#Oswald') format('svg');
+  /* IE9 Compat Modes */
+  src: url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.svg#Oswald') format('svg');
+  /* Legacy iOS */
   font-weight: normal;
   font-style: normal;
   text-rendering: optimizeLegibility;
@@ -15,27 +17,37 @@ a:active {
 @font-face {
   font-family: 'OpenSans-Regular';
   src: url('../fonts/OpenSans/Regular/OpenSans-Regular.eot');
-  src: url('../fonts/OpenSans/Regular/OpenSans-Regular.ttf') format('truetype'), url('../fonts/OpenSans/Regular/OpenSans-Regular.eot?#iefix') format('embedded-opentype'), url('../fonts/OpenSans/Regular/OpenSans-Regular.woff2') format('woff2'), url('../fonts/OpenSans/Regular/OpenSans-Regular.woff') format('woff'), url('../fonts/OpenSans/Regular/OpenSans-Regular.svg#svgFontName') format('svg');
+  /* IE9 Compat Modes */
+  src: url('../fonts/OpenSans/Regular/OpenSans-Regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/OpenSans/Regular/OpenSans-Regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/OpenSans/Regular/OpenSans-Regular.woff2') format('woff2'), /* Super Modern Browsers */ url('../fonts/OpenSans/Regular/OpenSans-Regular.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/OpenSans/Regular/OpenSans-Regular.svg#svgFontName') format('svg');
+  /* Legacy iOS */
 }
 @font-face {
   font-family: 'OpenSans-Semibold';
   src: url('../fonts/OpenSans/Semibold/OpenSans-Semibold.eot');
-  src: url('../fonts/OpenSans/Semibold/OpenSans-Semibold.ttf') format('truetype'), url('../fonts/OpenSans/Semibold/OpenSans-Semibold.eot?#iefix') format('embedded-opentype'), url('../fonts/OpenSans/Semibold/OpenSans-Semibold.woff2') format('woff2'), url('../fonts/OpenSans/Semibold/OpenSans-Semibold.woff') format('woff'), url('../fonts/OpenSans/Semibold/OpenSans-Semibold.svg#svgFontName') format('svg');
+  /* IE9 Compat Modes */
+  src: url('../fonts/OpenSans/Semibold/OpenSans-Semibold.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/OpenSans/Semibold/OpenSans-Semibold.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/OpenSans/Semibold/OpenSans-Semibold.woff2') format('woff2'), /* Super Modern Browsers */ url('../fonts/OpenSans/Semibold/OpenSans-Semibold.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/OpenSans/Semibold/OpenSans-Semibold.svg#svgFontName') format('svg');
+  /* Legacy iOS */
 }
 @font-face {
   font-family: 'ProximaNova-Regular';
-  src: url('../fonts/ProximanovaWebfont/ProximaNova-Regular.ttf') format('truetype'), url('../fonts/ProximanovaWebfont/ProximaNova-Regular.woff') format('woff'), url('../fonts/ProximanovaWebfont/ProximaNova-Regular.eot?#iefix') format('embedded-opentype');
+  src: url('../fonts/ProximanovaWebfont/ProximaNova-Regular.ttf') format('truetype'), url('../fonts/ProximanovaWebfont/ProximaNova-Regular.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/ProximanovaWebfont/ProximaNova-Regular.eot?#iefix') format('embedded-opentype');
+  /* IE6-IE8 */
+  /* Safari, Android, iOS */
   font-style: normal;
   font-weight: normal;
   text-rendering: optimizeLegibility;
 }
 @font-face {
   font-family: 'ProximaNova-Semibold';
-  src: url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.ttf') format('truetype'), url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.woff') format('woff'), url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.eot?#iefix') format('embedded-opentype');
+  src: url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.eot?#iefix') format('embedded-opentype');
+  /* IE6-IE8 */
   font-style: normal;
   font-weight: normal;
   text-rendering: optimizeLegibility;
 }
+/**********************************/
+/************ Layout **************/
+/**********************************/
 html {
   height: 100%;
   overflow-y: auto;
@@ -102,6 +114,7 @@ body {
 @media (min-width: 992px) {
   .global-nav .logo-container {
     display: inline-block;
+    width: 150px;
     z-index: 2;
     padding-left: 6%;
     margin-top: 1px;
@@ -113,11 +126,13 @@ body {
     position: absolute;
     width: 100%;
     height: 42px;
+    /*        border-top:1px solid #ddd;*/
     border-bottom: 1px solid #ddd;
   }
   .app-nav .module-action-bar .module-action-content {
     background: #FBFBFB;
     height: 41px;
+    /*        border-bottom: 1px solid #eee;*/
   }
   .app-nav .module-action-bar .module-action-content .navbar-right {
     margin-right: 0;
@@ -163,7 +178,7 @@ body {
     padding-left: 0;
   }
 }
-.btn-toolbar >.btn-group:first-child {
+.btn-toolbar > .btn-group:first-child {
   margin-left: 5px;
 }
 .vt-notification {
@@ -196,15 +211,19 @@ body {
 .vt-notification [data-notify="message"] {
   color: #eaeaea;
 }
+/**********************************/
+/******** Navigation styles *******/
+/**********************************/
 .company-logo {
   height: 40px;
+  width: 150px;
   margin: 0 0;
   display: inline-block;
   margin-left: 1px;
 }
 .company-logo img {
-  max-height: 100%;
-  max-width: 100%;
+  height: 100%;
+  width: auto;
 }
 .navbar .fa {
   font-size: 15px;
@@ -214,10 +233,13 @@ body {
   font-size: 16px;
   position: relative;
 }
+/*.module-action-bar .module-action-content #appnav{
+    padding-top:5px;
+}*/
 .global-nav .navbar-nav > li div a {
   padding: 15px;
 }
-.global-nav>ul {
+.global-nav > ul {
   margin-right: 20px;
 }
 .global-nav .search-links-container {
@@ -267,26 +289,28 @@ body {
     float: right;
     height: 42px;
   }
-  .module-action-bar .navbar-right .nav>li {
+  .module-action-bar .navbar-right .nav > li {
     display: inline-block;
   }
-  .module-action-bar .navbar-right .nav>li a {
+  .module-action-bar .navbar-right .nav > li a {
     padding: 0 10px;
   }
   .global-nav .logo-container {
     border-bottom: 0;
+    width: 150px;
   }
 }
 @media (max-width: 991px) {
   .global-nav .logo-container {
     border-bottom: 0;
+    width: 150px;
   }
   .notificationMessageHolder {
     padding-left: 45%;
   }
 }
 @media (min-width: 991px) {
-  .nav>li>a.qc-button {
+  .nav > li > a.qc-button {
     padding: 2px 3px;
     margin-top: 13px;
     margin-right: 15px;
@@ -294,7 +318,7 @@ body {
     color: #fff;
     border-radius: 20px;
   }
-  .nav>li>a.qc-button span {
+  .nav > li > a.qc-button span {
     vertical-align: top;
   }
 }
@@ -313,6 +337,7 @@ body {
   width: 100%;
   height: 100%;
 }
+/** App Nav Styles */
 .active-app-title {
   white-space: nowrap;
   font-family: Oswald, "OpenSans-Semibold", "Helvetica Neue", Helvetica, sans-serif;
@@ -367,7 +392,9 @@ body {
   height: 42px;
   text-align: center;
   line-height: 42px;
+  /*    background-color: #2c3b49;*/
   color: #ffffff;
+  /*border-bottom: 1px solid #272B46;*/
 }
 .app-nav .app-indicator-icon-container .app-indicator-icon {
   font-size: 24px;
@@ -479,16 +506,16 @@ body {
   right: -4px;
 }
 #overlayPageContent .mCSB_scrollTools,
-#overlayPageContent .mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar,
-#overlayPageContent .mCSB_scrollTools .mCSB_buttonUp,
-#overlayPageContent .mCSB_scrollTools .mCSB_buttonDown,
-#overlayPageContent .mCSB_scrollTools .mCSB_buttonLeft,
-#overlayPageContent .mCSB_scrollTools .mCSB_buttonRight,
 .app-list .mCSB_scrollTools,
+#overlayPageContent .mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar,
 .app-list .mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar,
+#overlayPageContent .mCSB_scrollTools .mCSB_buttonUp,
 .app-list .mCSB_scrollTools .mCSB_buttonUp,
+#overlayPageContent .mCSB_scrollTools .mCSB_buttonDown,
 .app-list .mCSB_scrollTools .mCSB_buttonDown,
+#overlayPageContent .mCSB_scrollTools .mCSB_buttonLeft,
 .app-list .mCSB_scrollTools .mCSB_buttonLeft,
+#overlayPageContent .mCSB_scrollTools .mCSB_buttonRight,
 .app-list .mCSB_scrollTools .mCSB_buttonRight {
   -webkit-transition: none;
   transition: none;
@@ -700,6 +727,7 @@ a.menu-item:hover {
   width: 0px;
   overflow: hidden;
 }
+/* User Logout */
 .logout-content {
   padding: 10px;
   width: 350px;
@@ -754,6 +782,9 @@ a.menu-item:hover {
 .app-settings {
   background: #FFFFFF;
 }
+/*************************************************/
+/******** View styles (List/Edit/Detail..) *******/
+/*************************************************/
 .viewContent .content-area {
   padding-left: 50px;
 }
@@ -791,7 +822,6 @@ a.menu-item:hover {
 .fieldValue .value {
   max-width: 85%;
   display: inline-block;
-  word-break: break-word;
 }
 .modal-header button.close {
   padding: 0;
@@ -865,6 +895,9 @@ input[type="password"].inputElement {
   padding-right: 20px;
   padding-left: 20px;
 }
+/**********************************/
+/**** Side vertical Nav styles ****/
+/**********************************/
 .module-nav {
   background: #fff;
   z-index: 1004;
@@ -880,6 +913,9 @@ input[type="password"].inputElement {
   left: 0;
   transition: 0s width;
 }
+.module-nav:hover {
+  /*z-index: 1001;*/
+}
 .modules-menu ul {
   list-style: none;
   margin-left: 0;
@@ -914,7 +950,7 @@ input[type="password"].inputElement {
   float: left;
   font-size: 20px;
 }
-.modules-menu ul li a>span {
+.modules-menu ul li a > span {
   margin-left: 10px;
   vertical-align: middle;
   font-size: 13px;
@@ -954,6 +990,7 @@ input[type="password"].inputElement {
   width: 100%;
   left: 0%;
 }
+/** Lists Menu in Side bar */
 .module-filters .settings-sidebar,
 .module-filters .sidebar-container {
   padding: 0 12px;
@@ -987,6 +1024,7 @@ input[type="password"].inputElement {
 .lists-menu-container hr {
   margin: 5px 0;
 }
+/* mScrollbar customization for lists widget */
 .lists-menu-container .menu-scroller .mCSB_scrollTools {
   width: 13px;
 }
@@ -998,8 +1036,10 @@ input[type="password"].inputElement {
 .modules-menu .mCSB_scrollTools .mCSB_draggerContainer {
   left: 8px;
 }
+/* Customization ends */
 .lists-menu-container .list-menu-content .more-less-link {
   color: #fff;
+  /*text-decoration: none;*/
 }
 .lists-menu-container .list-menu-content .sub-header {
   color: #ddd;
@@ -1104,9 +1144,11 @@ input[type="password"].inputElement {
 .common-links-container > div a {
   color: #fff;
 }
+/*Search Container styles */
 .search-container {
   min-height: 300px;
   position: absolute;
+  /*z-index: 1030;*/
   width: 100%;
   top: 0;
   background: #FBFBFB;
@@ -1125,6 +1167,7 @@ input[type="password"].inputElement {
 .footer p {
   margin: 5px 0;
 }
+/*** Utilities ***/
 .showElement {
   display: block !important;
   height: 100%;
@@ -1247,11 +1290,11 @@ ul.unstyled {
 }
 .emptyRecordsDiv .emptyRecordsContent {
   display: inline-block;
-  font-size: 16px;
   left: 50%;
   margin-left: -25%;
   position: absolute;
   width: 50%;
+  font-size: 16px;
 }
 .textOverflowEllipsis {
   overflow: hidden;
@@ -1276,6 +1319,9 @@ ul.unstyled {
 .removeNoFileChosen {
   color: transparent !important;
 }
+/***********************************
+**********Button Styles**********
+***********************************/
 .module-buttons-container {
   float: right;
   margin-right: 10px;
@@ -1297,6 +1343,7 @@ ul.unstyled {
   margin: 4px 2px;
   border-radius: 2px;
   border: 1px solid #ddd;
+  text-transform: uppercase;
   color: #666;
   background: #fff;
 }
@@ -1317,6 +1364,9 @@ ul.unstyled {
   color: #FFFFFF !important;
   background: #5bc0de !important;
 }
+/***********************************
+**********List View Styles**********
+***********************************/
 .fa.pull-left {
   margin-right: 0;
 }
@@ -1351,7 +1401,7 @@ ul.unstyled {
   font-size: 20px;
 }
 .listview-pagination .disabled {
-  color: rgba(0,0,0,0.2);
+  color: rgba(0, 0, 0, 0.2);
 }
 .listview-pagination .disabled:hover {
   cursor: default;
@@ -1379,6 +1429,8 @@ ul.unstyled {
 .listview-table {
   margin-bottom: 0;
   border-top: 0;
+  /* Horizontal scroll will not work if table layout Fixed */
+  /*    table-layout: fixed;*/
 }
 .listview-table tr td,
 .listview-table tr th {
@@ -1408,7 +1460,7 @@ ul.unstyled {
   width: 100%;
 }
 .listViewEntries .relatedListEntryValues .fieldValue .value,
-.listViewEntries  .listViewEntryValue .fieldValue .value {
+.listViewEntries .listViewEntryValue .fieldValue .value {
   vertical-align: middle;
   width: 100%;
   display: inline-block;
@@ -1423,7 +1475,7 @@ ul.unstyled {
 }
 .listview-table-norecords .table-actions,
 .listview-table .table-actions {
-  width: 120px;
+  width: 110px;
   font-size: 15px;
   color: #555;
   margin-left: 7px;
@@ -1489,13 +1541,13 @@ input[type=checkbox]:checked {
   vertical-align: middle;
   display: table-cell;
 }
-.listview-table  tr.searchRow th {
+.listview-table tr.searchRow th {
   padding: 5px 3px;
 }
-.listview-table  tr.searchRow th.inline-search-btn {
+.listview-table tr.searchRow th.inline-search-btn {
   padding: 3px 10px;
 }
-.listview-table  tr.searchRow th.inline-search-btn button {
+.listview-table tr.searchRow th.inline-search-btn button {
   text-align: center;
   width: 85%;
   text-shadow: none;
@@ -1523,6 +1575,18 @@ input[type=checkbox]:checked {
   background-color: #FFEEEE !important;
   background-image: none !important;
 }
+/*.floatThead-wrapper .table-container{
+    z-index: 0 !important;
+}*/
+/* List view bottom fixed scroll */
+/*.bottom-fixed-scroll{
+    height: 14px;
+    position: relative;
+    top: -15px;
+    overflow-x: auto;
+    overflow-y: hidden;
+    width: 100%;
+}*/
 .scroller-div {
   height: 1px;
 }
@@ -1644,12 +1708,12 @@ input[type=checkbox]:checked {
 #listColumnFilterContainer .disabled i {
   color: #ccc;
 }
+/**********************************
+**********Detail View Styles**********
+**********************************/
 .detailViewButtoncontainer {
   padding-top: 5px;
 }
-.detailViewButtoncontainer button.btn {
-  margin: 0px 1px !important;
-}
 .detailview-header .recordBasicInfo > .info-row {
   margin-bottom: 4px;
 }
@@ -1730,9 +1794,6 @@ th {
   margin-top: 3%;
   margin-right: 2%;
 }
-.overlayDetailHeader button.btn {
-  margin: 0px 1px !important;
-}
 .referencefield-wrapper .createReferenceRecord {
   float: left;
   margin-left: 5px;
@@ -1972,10 +2033,10 @@ th {
   z-index: 1030;
 }
 .overlay-container-60 {
-  margin-left: 42px;
+  margin-left: 42px ;
 }
 .overlay-container-300 {
-  margin-left: 230px;
+  margin-left: 230px ;
 }
 .overlayPageContent {
   background: #FFFFFF;
@@ -2098,6 +2159,9 @@ th {
   height: 26px;
   line-height: 25px;
 }
+/**********************************
+**********Summary View Styles******
+**********************************/
 .summary-table {
   width: 100%;
   table-layout: fixed;
@@ -2218,33 +2282,33 @@ th {
   opacity: 1;
   cursor: pointer;
 }
-.details.row >form .social-media-toggle {
+.details.row > form .social-media-toggle {
   position: absolute;
   right: -15px;
   display: inline-block;
   width: 500px;
   border-left: 0px;
 }
-.details.row >form .social-media-widget {
+.details.row > form .social-media-widget {
   border-left: 1px solid #ddd;
   border-bottom: 1px solid #ddd;
   height: 100%;
   background: white;
 }
-.details.row >form div[class*="col-"].resizable-summary-view {
+.details.row > form div[class*="col-"].resizable-summary-view {
   padding-left: 0;
   padding-right: 0px;
 }
-.details.row >form>div[class*="col-"],
-.details.row >form .resizable-summary-view div[class*="col-"] {
+.details.row > form > div[class*="col-"],
+.details.row > form .resizable-summary-view div[class*="col-"] {
   padding-right: 0;
   padding: 0px 5px;
 }
-.details.row >form>div[class*="col-"]:first-child,
-.details.row >form .left-block {
+.details.row > form > div[class*="col-"]:first-child,
+.details.row > form .left-block {
   padding-left: 0 !important;
 }
-.details.row >form>div[class*="col-"]:last-child {
+.details.row > form > div[class*="col-"]:last-child {
   padding-right: 0;
 }
 .summaryWidgetContainer .noContent {
@@ -2257,6 +2321,9 @@ th {
 .caseReplyArea .nav > li {
   padding: 0 10px;
 }
+/**********************************
+**********Edit View Styles*******
+**********************************/
 .main-container .editViewModNavigator.module-nav,
 .editViewModNavigator .mod-switcher-container,
 .editViewModNavigator .modules-menu {
@@ -2297,7 +2364,7 @@ th {
   width: 100%;
 }
 .editViewContents .input-group {
-  width: 229px;
+  width: 208px;
   float: left;
 }
 .input-group.inputElement .input-group-addon {
@@ -2376,6 +2443,9 @@ th {
   z-index: 1000;
   padding: 7px;
 }
+/**********************************
+**********Advance Search styles**********
+**********************************/
 .op0.fadeInx {
   opacity: 1;
 }
@@ -2448,7 +2518,11 @@ th {
 }
 .btn + input {
   margin-left: 5px;
+  /*    margin-top : 3px;*/
 }
+/**********************************
+**********Extension Store Styles**********
+**********************************/
 .extensionstore .app-trigger {
   width: 98%;
 }
@@ -2479,6 +2553,9 @@ th {
 .extensionContents .extensionError {
   color: #F10404;
 }
+/**********************************
+**********Extension Store Nav Bar**********
+**********************************/
 .tabbable-line > .nav-tabs {
   border: none;
   margin: 0px;
@@ -2547,6 +2624,9 @@ th {
 .extensionContents .listview-table {
   width: 100%;
 }
+/*******************************************
+******Detail View related list styles*******
+********************************************/
 .relatedContents .listViewContentHeaderValues:hover {
   text-decoration: none;
   color: #333;
@@ -2604,6 +2684,9 @@ th {
 .relatedViewActions .btn-group {
   margin-right: 15px;
 }
+/*******************************************
+****************** Modal *******************
+********************************************/
 .modal-header {
   padding: 5px 15px;
   background: #596875;
@@ -2631,6 +2714,7 @@ th {
   width: 100%;
   float: left;
   background: #596875;
+  /*    height: 100%;*/
 }
 .settings-menu {
   display: inline-block;
@@ -2647,7 +2731,7 @@ th {
   cursor: n-resize;
 }
 .settings-menu-items {
-  box-shadow: 0 1px 1px rgba(0,0,0,0.05);
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
   margin-bottom: 10px;
   text-align: justify;
 }
@@ -2765,9 +2849,6 @@ th {
 .active .stepNum {
   color: #FFFFFF;
 }
-.mailBoxEditDiv .crumbs li {
-  width: 22%;
-}
 .stepNum {
   display: inline-block;
   padding: 0 5px;
@@ -2776,6 +2857,7 @@ th {
   vertical-align: middle;
   color: #3399ff;
 }
+/* .squaredFour */
 .squaredFour {
   width: 20px;
   position: relative;
@@ -2789,9 +2871,9 @@ th {
   top: 0;
   left: 0;
   background: #fcfff4;
-  background: linear-gradient(top,#fcfff4 0%,#dfe5d7 40%,#b3bead 100%);
+  background: linear-gradient(top, #fcfff4 0%, #dfe5d7 40%, #b3bead 100%);
   border-radius: 4px;
-  box-shadow: inset 0px 1px 1px white, 0px 1px 3px rgba(0,0,0,0.5);
+  box-shadow: inset 0px 1px 1px white, 0px 1px 3px rgba(0, 0, 0, 0.5);
 }
 .squaredFour label:after {
   content: '';
@@ -2819,13 +2901,16 @@ th {
 .importBlockContainer {
   color: #596875;
 }
+/******************************************* 
+************* Social Buttons *************** 
+********************************************/
 .btn-block + .btn-block {
   margin-top: 5px;
 }
 .btn-google-plus {
   color: #FFFFFF !important;
   background-color: #DD4B39;
-  border-color: rgba(0,0,0,0.2);
+  border-color: rgba(0, 0, 0, 0.2);
 }
 .btn-social {
   position: relative;
@@ -2844,15 +2929,18 @@ th {
   line-height: 34px;
   font-size: 1.6em;
   text-align: center;
-  border-right: 1px solid rgba(0,0,0,0.2);
+  border-right: 1px solid rgba(0, 0, 0, 0.2);
 }
+/******************************************* 
+************* Updates Timeline *************** 
+********************************************/
 .recentActivitiesContainer .history {
   margin: 0 auto;
   padding: 20px 20px 1px;
   max-width: 100%;
   overflow-x: visible;
-  -webkit-transition: opacity .2s ease-out;
-  transition: opacity .2s ease-out;
+  -webkit-transition: opacity 0.2s ease-out;
+  transition: opacity 0.2s ease-out;
 }
 .updates_timeline {
   padding-top: 20px;
@@ -2861,6 +2949,7 @@ th {
   padding: 0;
   list-style: none;
 }
+/* The line */
 .updates_timeline:before {
   content: '';
   position: absolute;
@@ -2879,6 +2968,7 @@ th {
   min-height: 40px;
   z-index: 2;
 }
+/* Left Content(Time) */
 .updates_timeline > li .update_time {
   position: absolute;
   margin: 0;
@@ -2890,6 +2980,7 @@ th {
   font-size: 15px;
   font-style: italic;
 }
+/* Right content(Update info) */
 .updates_timeline > li .update_info {
   padding: 10px 10px 1px;
   display: block;
@@ -2898,10 +2989,11 @@ th {
   position: relative;
   top: -45px;
 }
-.updates_timeline > li .update_info >h3 {
+.updates_timeline > li .update_info > h3 {
   font-size: 1.1em;
   margin-left: -3%;
 }
+/* The icons  */
 .updates_timeline > li .update_icon {
   position: relative;
   border-radius: 50%;
@@ -2914,6 +3006,7 @@ th {
   color: #fff;
   line-height: 35px;
 }
+/* More Button */
 .updates_timeline #more_button .update_icon {
   position: relative;
   border-radius: 0;
@@ -3021,6 +3114,9 @@ th {
   vertical-align: super;
   font-size: 13px;
 }
+/******************************************* 
+************* Task Management ************** 
+********************************************/
 #taskManagementContainer .data-body {
   margin-bottom: 50px;
 }
@@ -3083,15 +3179,16 @@ th {
 #taskManagementContainer .other-details {
   color: #979797;
 }
+/*overwriting jquery ui css*/
 .ui-menu {
   z-index: 10000;
 }
 #taskManagementContainer button.active {
   background: #3B83F7;
   color: white;
-  text-shadow: 0 1px rgba(0,0,0,0.3);
+  text-shadow: 0 1px rgba(0, 0, 0, 0.3);
   border: 1px solid #135fd7;
-  box-shadow: inset 0 1px 2px rgba(0,0,0,0.3);
+  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.3);
 }
 .taskSubject {
   width: 99%;
@@ -3099,6 +3196,9 @@ th {
 #taskManagementContainer .mCustomScrollbar .mCSB_inside > .mCSB_container {
   margin-right: 13px;
 }
+/******************************************* 
+************* Settings Page ************** 
+********************************************/
 .settingsPageDiv.content-area {
   margin-right: 0;
 }
@@ -3132,6 +3232,9 @@ th {
 .settingsgroup-accordion a i {
   margin-right: 5px;
 }
+.settingsgroup-accordion a span {
+  text-transform: uppercase;
+}
 .settingsgroup {
   background: #2C3B49;
   height: 100%;
@@ -3288,35 +3391,59 @@ th {
 }
 .mini-slider-control[data-value="0"] .ui-slider-handle {
   background: #7d7e7d;
-  background: -moz-linear-gradient(top,#7d7e7d 0%,#0e0e0e 100%);
-  background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#7d7e7d),color-stop(100%,#0e0e0e));
-  background: -webkit-linear-gradient(top,#7d7e7d 0%,#0e0e0e 100%);
-  background: -o-linear-gradient(top,#7d7e7d 0%,#0e0e0e 100%);
-  background: -ms-linear-gradient(top,#7d7e7d 0%,#0e0e0e 100%);
-  background: linear-gradient(to bottom,#7d7e7d 0%,#0e0e0e 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#7d7e7d',endColorstr='#0e0e0e',GradientType=0);
+  /* Old browsers */
+  background: -moz-linear-gradient(top, #7d7e7d 0%, #0e0e0e 100%);
+  /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #7d7e7d), color-stop(100%, #0e0e0e));
+  /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #7d7e7d 0%, #0e0e0e 100%);
+  /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top, #7d7e7d 0%, #0e0e0e 100%);
+  /* Opera 11.10+ */
+  background: -ms-linear-gradient(top, #7d7e7d 0%, #0e0e0e 100%);
+  /* IE10+ */
+  background: linear-gradient(to bottom, #7d7e7d 0%, #0e0e0e 100%);
+  /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#7d7e7d', endColorstr='#0e0e0e', GradientType=0);
+  /* IE6-9 */
   margin-left: 0px;
 }
 .mini-slider-control[data-value="1"] .ui-slider-handle {
   background: #ffb76b;
-  background: -moz-linear-gradient(top,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#ffb76b),color-stop(0%,#ffa73d),color-stop(49%,#ff7c00),color-stop(100%,#ff7f04));
-  background: -webkit-linear-gradient(top,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  background: -o-linear-gradient(top,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  background: -ms-linear-gradient(top,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  background: linear-gradient(to bottom,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffb76b',endColorstr='#ff7f04',GradientType=0);
+  /* Old browsers */
+  background: -moz-linear-gradient(top, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffb76b), color-stop(0%, #ffa73d), color-stop(49%, #ff7c00), color-stop(100%, #ff7f04));
+  /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* Opera 11.10+ */
+  background: -ms-linear-gradient(top, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* IE10+ */
+  background: linear-gradient(to bottom, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffb76b', endColorstr='#ff7f04', GradientType=0);
+  /* IE6-9 */
   margin-left: -6px;
 }
 .mini-slider-control[data-value="2"] .ui-slider-handle {
   background: #bfd255;
-  background: -moz-linear-gradient(top,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#bfd255),color-stop(79%,#8eb92a),color-stop(100%,#72aa00),color-stop(100%,#9ecb2d));
-  background: -webkit-linear-gradient(top,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  background: -o-linear-gradient(top,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  background: -ms-linear-gradient(top,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  background: linear-gradient(to bottom,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bfd255',endColorstr='#9ecb2d',GradientType=0);
+  /* Old browsers */
+  background: -moz-linear-gradient(top, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #bfd255), color-stop(79%, #8eb92a), color-stop(100%, #72aa00), color-stop(100%, #9ecb2d));
+  /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* Opera 11.10+ */
+  background: -ms-linear-gradient(top, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* IE10+ */
+  background: linear-gradient(to bottom, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bfd255', endColorstr='#9ecb2d', GradientType=0);
+  /* IE6-9 */
   margin-left: -13px;
 }
 .ModulemanagerSettings .moduleblock .hiden {
@@ -3341,10 +3468,13 @@ th {
 th {
   padding: 6px;
 }
+/******************************************* 
+********** CustomerPortal styles start ********
+********************************************/
 .cp-tabs .enabledModules {
   display: inline-block ! important;
-  margin-left: 4px !important;
-  margin-right: 4px !important;
+  margin-left: 4px!important;
+  margin-right: 4px!important;
   vertical-align: top;
 }
 .drag-portal-module {
@@ -3451,7 +3581,7 @@ th {
   margin-left: 5px;
 }
 .portal-field-delete {
-  margin-left: 45px !important;
+  margin-left: 45px!important;
 }
 .portalModuleRow {
   border-left: 4px solid #6297C3 !important;
@@ -3468,7 +3598,7 @@ th {
   content: "*";
   color: red;
 }
-.nav-tabs .cp-modules > .active >a,
+.nav-tabs .cp-modules > .active > a,
 .nav-tabs .cp-modules > .active > a:hover {
   border: 0px !important;
   border-top-right-radius: 0px;
@@ -3630,7 +3760,7 @@ th {
   display: inline-block;
 }
 .quickPreview .updates_timeline:before {
-  background: #e6e6e6;
+  background: #e5e5e5;
   width: 2px;
   margin-left: -1%;
 }
@@ -3645,13 +3775,16 @@ th {
 .quickPreviewComments .recentComments .commentDetails .comment {
   line-height: 15px;
 }
-.quickPreviewComments  .summaryWidgetContainer {
+.quickPreviewComments .summaryWidgetContainer {
   border: 0;
   padding: 0;
 }
 .quickPreview .recentActivitiesContainer .history {
   padding: 0;
 }
+/******************************************* 
+********** Calendar view styles ************
+********************************************/
 .calendar-sidebar {
   width: 100% !important;
 }
@@ -3808,6 +3941,11 @@ th {
   display: inline-block;
   text-align: center;
 }
+/******************************************* 
+********** Calendar view styles end ********
+
+********** Documents Module styles *********
+********************************************/
 .dragdrop-dotted {
   border: 2px dashed #C0C0C0;
   min-width: 300px;
@@ -3867,13 +4005,16 @@ tr.file > td.fileOwnerData {
   width: 100px;
   white-space: pre-wrap;
 }
+/******************************************* 
+********** Documents Module styles end *****
+********************************************/
 .engagementsContainer .engagements_content {
   padding-top: 15px;
 }
 .summaryWidgetContainer .engagementsContainer table {
   width: inherit;
 }
-.engagements_content table thead>tr:first-child {
+.engagements_content table thead > tr:first-child {
   border: 1px solid #CCC;
   background-color: #F5F5F5;
 }
@@ -3924,6 +4065,9 @@ tr.file > td.fileOwnerData {
   font-size: 15px;
   padding: 1% 0;
 }
+/******************************************* 
+********** Mailroom view styles start ********
+********************************************/
 .mailroomBanner {
   margin: 23px 0;
   height: 215px;
@@ -4132,6 +4276,7 @@ tr.file > td.fileOwnerData {
   margin-left: 0;
 }
 .mentionMessages .mention_follow_up {
+  /*//load this color from variable.less*/
   background-color: green;
 }
 .modelContainer .modal-content {
@@ -4280,6 +4425,7 @@ form[name="notification_settings"] .select2-choice {
   margin-left: 0;
 }
 .mentionMessages .mention_follow_up {
+  /*//load this color from variable.less*/
   background-color: green;
 }
 .modal-content .mention_followup .row {
@@ -4311,6 +4457,9 @@ form[name="notification_settings"] .select2-choice {
 .mentionMessageHeader .MultiFile-remove {
   color: #FFFFFF;
 }
+/******************************************* 
+********** Mailroom view styles end ********
+********************************************/
 .detailview-header {
   margin-bottom: 10px;
 }
@@ -4326,6 +4475,7 @@ form[name="notification_settings"] .select2-choice {
   margin: 0px 10px;
   text-decoration: underline !important;
   color: #3498DB;
+  /*font-size : 12px;*/
 }
 .tag {
   display: inline-block;
@@ -4409,11 +4559,10 @@ form[name="notification_settings"] .select2-choice {
   border: 1px solid #dcdcdc;
 }
 #tagCloud .tag {
-  color: #5ea9dd;
-  padding: 0px;
   background-color: #FFFFFF;
   border-color: #FFFFFF;
   border-radius: 0px;
+  color: #5ea9dd;
   margin: 3px;
 }
 #tagCloud .tag[data-type="public"] {
@@ -4424,6 +4573,9 @@ form[name="notification_settings"] .select2-choice {
   max-width: 80px;
   vertical-align: bottom;
 }
+/******************************************* 
+********** Groups view styles ********
+********************************************/
 #s2id_memberList li > div,
 .groupMembersColors li > div {
   margin-left: 10px;
@@ -4498,6 +4650,12 @@ form[name="notification_settings"] .select2-choice {
   margin: 0px;
   color: #444444;
 }
+/******************************************* 
+********** Groups view styles  ends********
+********************************************/
+/******************************************* 
+********** Picklist Css ********
+********************************************/
 .pickListValue {
   background-color: #FFFFFF;
 }
@@ -4512,6 +4670,12 @@ form[name="notification_settings"] .select2-choice {
   padding: 2px 1px !important;
   line-height: 15px;
 }
+/******************************************* 
+************* Dashboard Styles *************
+********************************************/
+li.dashboardWidget {
+  overflow: auto;
+}
 .dashboardWidgetHeader .title {
   padding-bottom: 10px;
   font-size: 15px;
@@ -4532,9 +4696,6 @@ form[name="notification_settings"] .select2-choice {
 .dashBoardContainer .tabContainer .tab-content {
   margin-top: 10px;
 }
-.dashBoardContainer .dashBoardTabContents ul {
-  margin: 0;
-}
 .dashBoardContainer .dashBoardTabContents ul li {
   border: 3px solid #E2E2E4;
   box-shadow: 1px;
@@ -4601,7 +4762,7 @@ form[name="notification_settings"] .select2-choice {
   display: inline-block;
   opacity: 1;
 }
-.dashBoardContainer .tabContainer li a  .deleteTab:hover {
+.dashBoardContainer .tabContainer li a .deleteTab:hover {
   cursor: pointer;
 }
 #minilistWizardContainer .fieldLabel {
@@ -4638,6 +4799,9 @@ form[name="notification_settings"] .select2-choice {
   resize: none;
   width: 100%;
 }
+/******************************************* 
+********** Picklist DependencyGraph ********
+********************************************/
 #dependencyGraph .tableHeading {
   text-align: center;
   padding-top: 30px;
@@ -4663,12 +4827,15 @@ form[name="notification_settings"] .select2-choice {
 #dependencyGraph .dependencyMapping .pickListDependencyTable .selectedCell {
   background: #a9cbf5;
 }
+/******************************************* 
+********** Rewriting select2 for consistency********
+********************************************/
 .select2-container .select2-choice {
   height: 29px;
   border-radius: 1px;
 }
 .modal {
-  z-index: 1100;
+  z-index: 1070;
 }
 .select2-container .select2-choice {
   height: 28px;
@@ -4756,6 +4923,7 @@ hr {
   position: fixed;
   bottom: 0;
   background: #EFEFEF;
+  /*width:100%;*/
   border-left: 42px solid #2c3b49;
   height: 60px;
   left: 0;
@@ -4774,7 +4942,6 @@ hr {
 }
 .settingsPageDiv .modal-overlay-footer {
   margin-left: 230px;
-  border-left: 0px solid;
 }
 .settingsOverlayContainer .modal-overlay-footer {
   margin: 0;
@@ -4797,14 +4964,14 @@ hr {
   vertical-align: middle;
   margin-top: 6px;
 }
-.list-menu-content .pull-right>.dropdown-menu {
+.list-menu-content .pull-right > .dropdown-menu {
   left: -126px;
   position: relative;
 }
-.dropdown-menu>li>a {
+.dropdown-menu > li > a {
   padding: 4px 6px;
 }
-.dropdown-menu>li>a span i {
+.dropdown-menu > li > a span i {
   font-size: 15px;
   vertical-align: middle;
 }
@@ -4812,11 +4979,11 @@ hr {
   max-height: 300px;
   padding-left: 0;
 }
-.related-tabs .dropdown-menu>.mCustomScrollBox>.mCSB_container {
+.related-tabs .dropdown-menu > .mCustomScrollBox > .mCSB_container {
   margin-right: 0;
   padding: 4px 6px;
 }
-.related-tabs .dropdown-menu>.mCustomScrollBox>.mCSB_container>li>a {
+.related-tabs .dropdown-menu > .mCustomScrollBox > .mCSB_container > li > a {
   display: block;
   padding: 3px 5px;
   clear: both;
@@ -4825,7 +4992,7 @@ hr {
   color: #333;
   white-space: nowrap;
 }
-.related-tabs .dropdown-menu>.mCustomScrollBox>.mCSB_container span i {
+.related-tabs .dropdown-menu > .mCustomScrollBox > .mCSB_container span i {
   font-size: 15px;
   vertical-align: middle;
 }
@@ -4848,16 +5015,16 @@ hr {
 .calendar-sidebar .calendar-sidebar-tabs.padding {
   padding-left: 20px !important;
 }
-.related-tabs.row .nav>li {
+.related-tabs.row .nav > li {
   padding: 0 10px;
   margin: 0 2px;
 }
-.massEditTabs.nav>li {
+.massEditTabs.nav > li {
   padding: 0 10px;
   margin: 0 4px;
 }
-.row .nav>li>a,
-.row .nav>li>a:hover {
+.row .nav > li > a,
+.row .nav > li > a:hover {
   padding: 10px 3px;
   border: none;
   vertical-align: bottom;
@@ -4867,38 +5034,39 @@ hr {
   -webkit-box-sizing: border-box;
   -o-box-sizing: border-box;
 }
-.row .nav>li>a:hover {
+.row .nav > li > a:hover {
   border-bottom-color: #555;
 }
-TN-34230
-
-.row .nav>li>a:hover {
+/*.row ul{
+    padding:0;
+}*/
+TN-34230 .row .nav > li > a:hover {
   border-bottom-color: #555;
   background: none;
 }
 .row ul li:first-child {
   margin-left: 0;
 }
-.related-tabs .nav-tabs>li.active,
-.related-tabs .nav-tabs>li:hover,
-.related-tabs .nav-tabs>li.active:focus,
-.dashBoardContainer .nav-tabs>li.active,
-.dashBoardContainer .nav-tabs>li:hover,
-.dashBoardContainer .nav-tabs>li.active:focus,
-.contents.tabbable .nav-tabs>li.active,
-.contents.tabbable .nav-tabs>li:hover,
-.contents.tabbable .nav-tabs>li.active:focus {
+.related-tabs .nav-tabs > li.active,
+.dashBoardContainer .nav-tabs > li.active,
+.contents.tabbable .nav-tabs > li.active,
+.related-tabs .nav-tabs > li:hover,
+.dashBoardContainer .nav-tabs > li:hover,
+.contents.tabbable .nav-tabs > li:hover,
+.related-tabs .nav-tabs > li.active:focus,
+.dashBoardContainer .nav-tabs > li.active:focus,
+.contents.tabbable .nav-tabs > li.active:focus {
   border: none;
   border-bottom: 3px solid #555;
 }
-.nav-tabs>li.active>a,
-.nav-tabs>li.active>a:hover,
-.nav-tabs>li.active>a:focus,
-.nav-tabs>li>a {
+.nav-tabs > li.active > a,
+.nav-tabs > li.active > a:hover,
+.nav-tabs > li.active > a:focus,
+.nav-tabs > li > a {
   border: 0;
 }
-.nav>li>a:hover,
-.nav>li>a:focus {
+.nav > li > a:hover,
+.nav > li > a:focus {
   background-color: #FFFFFF;
 }
 .fa-pencil,
@@ -4908,6 +5076,9 @@ TN-34230
 .commentAttachmentName {
   font-size: 11px;
 }
+/******************************************* 
+********** Layout Editor ********
+********************************************/
 .marginBottom10px {
   margin-bottom: 10px;
 }
@@ -4930,6 +5101,7 @@ TN-34230
 }
 .zeroOpacity {
   opacity: 0;
+  /*for IE*/
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
   filter: alpha(opacity=0);
 }
@@ -4956,10 +5128,12 @@ TN-34230
 .layoutContent .opacity:hover .actions {
   opacity: 1;
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
+  /*for IE*/
   filter: alpha(opacity=100);
 }
 .layoutContent .fieldPropertyContainer:hover .actions {
   opacity: 1;
+  /*for IE*/
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
   filter: alpha(opacity=100);
 }
@@ -4982,6 +5156,7 @@ TN-34230
 .relatedTabModulesList .addButton {
   border-radius: 2px;
   border: 1px solid #DDDDDD;
+  text-transform: uppercase;
   color: #666666;
   background: #FFFFFF;
 }
@@ -5055,6 +5230,9 @@ TN-34230
   margin-left: 5px;
   word-break: break-all;
 }
+/******************************************* 
+************** Tax Management **************
+********************************************/
 #TaxCalculationsContainer .table tr:first-child,
 .taxModalContainer #editTax .table tr:first-child {
   border-bottom: 1px solid #ccc;
@@ -5094,6 +5272,9 @@ TN-34230
   max-height: 500px;
   overflow-y: auto;
 }
+/******************************************* 
+********** Workflows ********
+********************************************/
 #workflow_edit .editViewBody {
   overflow: inherit;
 }
@@ -5103,7 +5284,7 @@ TN-34230
 }
 .timePicker {
   width: 9.5em !important;
-  z-index: 1101 !important;
+  z-index: 1070 !important;
 }
 .weekDaySelect .ui-state-default {
   background: inherit;
@@ -5141,75 +5322,6 @@ TN-34230
 .module-filters.active {
   background: #F7F7F7;
 }
-.payment-type-selection {
-  margin-bottom: 30px;
-}
-.payment-type-selection img {
-  vertical-align: middle;
-}
-.currplan {
-  padding: 10px 20px;
-  background-color: #f3f3f3;
-  border: 1px solid #eee;
-  border-radius: 3px;
-}
-.currplan div {
-  display: inline-block;
-  font-size: 16px;
-}
-.planName {
-  display: inline-block;
-  color: #fff;
-  padding: 20px;
-  margin: 10px 20px;
-  font-size: 24px;
-  border-radius: 2px;
-}
-.plan-heading {
-  min-height: 168px;
-}
-.plan-title {
-  color: #fff;
-  font-size: 20px;
-  padding: 13px 0;
-}
-#sales_plan {
-  background: #3FC380;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#salespremium_plan {
-  background: #00B16A;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#support_plan {
-  background: #2980B9;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#supportpremium_plan {
-  background: #2980B9;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#ultimate_plan,
-#exclusive_plan {
-  background: #F39C12;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#contact_plan {
-  background: #FF5959;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
 .workflowListContainer .select2-container .select2-choice {
   height: 36px;
 }
@@ -5224,6 +5336,7 @@ TN-34230
 .contactAdd {
   border: 1px solid #eee;
   padding: 20px;
+  /*min-height: 310px !important;*/
 }
 #subDetails table td {
   padding: 7px 10px;
@@ -5346,9 +5459,9 @@ TN-34230
 .productBundles {
   padding-left: 20px;
 }
-.nav .open>a,
-.nav .open>a:hover,
-.nav .open>a:focus {
+.nav .open > a,
+.nav .open > a:hover,
+.nav .open > a:focus {
   color: #000000;
   background-color: #FFFFFF;
 }
@@ -5369,6 +5482,9 @@ TN-34230
   width: 100%;
   overflow-x: auto;
 }
+/******************************************* 
+*************** Mail Manager ***************
+********************************************/
 #mm_searchButton {
   height: 28px;
   background-color: #FFFFFF;
@@ -5424,8 +5540,8 @@ TN-34230
   padding: 1px 5px;
   border-radius: 3px;
   text-align: center;
-  text-shadow: 0 1px rgba(0,0,0,0.1);
-  background-image: -webkit-linear-gradient(top,#DD4B39 0,#D14836 100%);
+  text-shadow: 0 1px rgba(0, 0, 0, 0.1);
+  background-image: -webkit-linear-gradient(top, #DD4B39 0, #D14836 100%);
   border: 1px solid #C6322A;
   background-color: #DD4B39;
 }
@@ -5643,6 +5759,7 @@ TN-34230
 .width40per {
   width: 40%;
 }
+/****** Mail Manager Ends ******/
 .quickCreateContent .massEditTable textarea,
 .addCommentBlock .commentTextArea textarea {
   resize: vertical;
@@ -5655,19 +5772,20 @@ TN-34230
 .select2-container-multi .select2-choices {
   z-index: 1;
 }
-.nav .nav-stacks .cp-nav-header-wrapper>li.disabled>a:hover {
+/****** Customer Portal Settings ******/
+.nav .nav-stacks .cp-nav-header-wrapper > li.disabled > a:hover {
   background-color: #fff;
 }
-.cp-nav-header-wrapper>li.disabled>a:hover {
+.cp-nav-header-wrapper > li.disabled > a:hover {
   border: 0px ! important;
 }
-.nav .nav-stacks .cp-nav-header-wrapper>li.disabled>a {
+.nav .nav-stacks .cp-nav-header-wrapper > li.disabled > a {
   background-color: #fff;
 }
-#portalModulesTable>li.portalModuleRow.active>a:hover {
+#portalModulesTable > li.portalModuleRow.active > a:hover {
   background-color: #fff !important;
 }
-#portalModulesTable>li.portalModuleRow.active>a:focus {
+#portalModulesTable > li.portalModuleRow.active > a:focus {
   background-color: #fff !important;
 }
 .portal-dashboard {
@@ -5766,7 +5884,7 @@ TN-34230
 .portal-dashboard {
   border-bottom: 0px ! important;
 }
-#portal-shortcutsContainer>ul {
+#portal-shortcutsContainer > ul {
   border-bottom: 0px ! important;
 }
 .portalMenuHeader {
@@ -5775,14 +5893,15 @@ TN-34230
 }
 .cp-tabs .enabledModules {
   display: inline-block ! important;
-  margin-left: 4px !important;
-  margin-right: 4px !important;
+  margin-left: 4px!important;
+  margin-right: 4px!important;
   vertical-align: top;
   margin-top: 4px !important;
 }
 .portal-shortcut-list:hover {
   border-bottom: 3px solid transparent ! important;
 }
+/****** Customer Portal Settings ******/
 .label-radio label input[type="radio"] {
   position: relative;
   top: 2px;
@@ -5794,6 +5913,9 @@ TN-34230
 div.tooltip-inner {
   max-width: 400px;
 }
+/******************************************* 
+********** Menu Editor ********
+********************************************/
 .sortable.appContainer.ui-sortable {
   width: 160px;
 }
@@ -5968,7 +6090,7 @@ div.tooltip-inner {
   width: 13px !important;
   margin-top: 8px;
 }
-.detailview-table .input-group-addon+.inputElement.form-control,
+.detailview-table .input-group-addon + .inputElement.form-control,
 .detailview-table .inputElement.form-control.input-medium {
   width: 100%;
 }
@@ -6015,6 +6137,7 @@ div.tooltip-inner {
   float: left;
   margin-right: 5px;
 }
+/***** Oursites Changes *****/
 .portal-table .table-actions {
   width: inherit ! important;
 }
@@ -6026,6 +6149,7 @@ div.tooltip-inner {
   padding: 10px 5px ! important;
   padding-left: 10px ! important;
 }
+/***** Oursites Changes *****/
 .ExtensionscontentsDiv .content-area {
   padding-left: 15px;
   padding-right: 15px;
@@ -6039,14 +6163,14 @@ div.tooltip-inner {
 }
 .blockHeader {
   border-color: #F3F3F4 #F3F3F4 #cbcbcf;
-  border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
   background-color: #474747;
-  background-image: -moz-linear-gradient(top,#555555,#333333);
-  background-image: -ms-linear-gradient(top,#555555,#333333);
-  background-image: -webkit-gradient(linear,0 0,0 100%,from(#555555),to(#333333));
-  background-image: -webkit-linear-gradient(top,#555555,#333333);
-  background-image: -o-linear-gradient(top,#555555,#333333);
-  background-image: linear-gradient(top,#555555,#333333);
+  background-image: -moz-linear-gradient(top, #555555, #333333);
+  background-image: -ms-linear-gradient(top, #555555, #333333);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#333333));
+  background-image: -webkit-linear-gradient(top, #555555, #333333);
+  background-image: -o-linear-gradient(top, #555555, #333333);
+  background-image: linear-gradient(top, #555555, #333333);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#333333', GradientType=0);
   min-height: 30px;
@@ -6139,8 +6263,8 @@ div.tooltip-inner {
 .markStar .starredStatus {
   display: none;
 }
-.nav>li.addDashboardTab>a,
-.nav>li.addDashboardTab>a:hover {
+.nav > li.addDashboardTab > a,
+.nav > li.addDashboardTab > a:hover {
   padding: 10px 15px;
   background: inherit;
 }
@@ -6153,7 +6277,7 @@ div.tooltip-inner {
   height: 960px;
   width: 1260px;
 }
-.nav-tabs>li {
+.nav-tabs > li {
   border-bottom: 3px solid transparent;
   margin: 0 2px;
 }
@@ -6231,16 +6355,14 @@ div.tooltip-inner {
 }
 .select2-container.select2-container-multi.select2,
 .editViewPageDiv .select2-container.select2-container-multi.select2 {
-  height: auto !important;
+  height: auto!important;
 }
-.summaryViewFields .select2-container-multi.inputElement.form-control
-.quickCreateContent .select2-container.select2-container-multi.select2,
+.summaryViewFields .select2-container-multi.inputElement.form-control .quickCreateContent .select2-container.select2-container-multi.select2,
 #massEditContainer .select2-container.select2-container-multi.select2 {
   width: 150px;
   height: auto !important;
 }
-.summaryViewFields .select2-container-multi.inputElement.form-control
-.quickCreateContent .select2-container.select2-container-multi.select2 .input-save-wrap,
+.summaryViewFields .select2-container-multi.inputElement.form-control .quickCreateContent .select2-container.select2-container-multi.select2 .input-save-wrap,
 #massEditContainer .select2-container.select2-container-multi.select2 .input-save-wrap {
   float: right;
   margin-right: 25px;
@@ -6336,6 +6458,7 @@ a.cp-modules:hover {
 #RestrictionsLayout {
   background: #fafafb;
   margin-top: -92px;
+  /*to adjust with page padding top*/
 }
 #RestrictionsLayout .vtImage {
   width: 22%;
@@ -6369,6 +6492,7 @@ a.cp-modules:hover {
 .datepicker {
   z-index: 1100 !important;
 }
+/*****RSS Changes****/
 .feedListContainer .listview-table tr td:first-child,
 .listview-table tr th:first-child {
   width: inherit ! important;
@@ -6376,12 +6500,14 @@ a.cp-modules:hover {
 .feedListContainer .listViewEntries .listViewEntryValue {
   max-width: inherit ! important;
 }
-.ps-container>.ps-scrollbar-y-rail {
+/*****RSS Changes****/
+.ps-container > .ps-scrollbar-y-rail {
   z-index: 1002;
 }
 #relationBlock .recordScroll {
   max-height: 150px;
 }
+/*Start - List sidebar toggle*/
 .essentials-toggle {
   background-color: white;
   font-weight: bold;
@@ -6401,6 +6527,7 @@ a.cp-modules:hover {
 .essentials-toggle .fa-chevron-right {
   background-position: -460px -72px !important;
 }
+/*End - List essentials toggle*/
 .module-name-tooltip .qtip-content {
   font-size: 12px;
   padding: 3px;
@@ -6484,8 +6611,8 @@ li.select2-search-choice div {
 .popover ul.listmenu li {
   padding: 3px;
 }
-.popover-content .disabled>a,
-.popover .disabled>a {
+.popover-content .disabled > a,
+.popover .disabled > a {
   opacity: 0.5;
   cursor: not-allowed;
 }
@@ -6496,6 +6623,7 @@ li.select2-search-choice div {
   -o-transform: rotate(180deg);
   transform: rotate(180deg);
 }
+/*Start - List sidebar toggle*/
 .essentials-toggle {
   background-color: white;
   font-weight: bold;
@@ -6515,6 +6643,7 @@ li.select2-search-choice div {
 .essentials-toggle .fa-chevron-right {
   background-position: -460px -72px !important;
 }
+/*End - List essentials toggle*/
 .module-name-tooltip .qtip-content {
   font-size: 12px;
   padding: 3px;
@@ -6595,16 +6724,16 @@ li.select2-search-choice div {
 #reportDetails .pivot .toptitle.targetY0,
 #reportDetails .pivot .lefttitle.targetX0 {
   border-color: #F3F3F4 #F3F3F4 #cbcbcf;
-  border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
   background-color: #474747;
-  background-image: -moz-linear-gradient(top,#555555,#333333);
-  background-image: -ms-linear-gradient(top,#555555,#333333);
-  background-image: -webkit-gradient(linear,0 0,0 100%,from(#555555),to(#333333));
-  background-image: -webkit-linear-gradient(top,#555555,#333333);
-  background-image: -o-linear-gradient(top,#555555,#333333);
-  background-image: linear-gradient(top,#555555,#333333);
+  background-image: -moz-linear-gradient(top, #555555, #333333);
+  background-image: -ms-linear-gradient(top, #555555, #333333);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#333333));
+  background-image: -webkit-linear-gradient(top, #555555, #333333);
+  background-image: -o-linear-gradient(top, #555555, #333333);
+  background-image: linear-gradient(top, #555555, #333333);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555',endColorstr='#333333',GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#333333', GradientType=0);
   min-height: 30px;
 }
 #reportDetails .pivot th.toptitle.targetY0,
@@ -6646,7 +6775,8 @@ li.select2-search-choice div {
   background: #FFFFFF;
 }
 .templateActions {
-  background: rgba(0,0,0,0.1);
+  background: rgba(0, 0, 0, 0.1);
+  /*padding: 4%;*/
   bottom: 0;
   text-align: center;
   position: absolute;
@@ -6654,6 +6784,9 @@ li.select2-search-choice div {
   zoom: 1;
   width: 100%;
 }
+/*.templateActions i {
+    margin-right: 30px;
+}*/
 .thumbnails > li {
   float: left;
   height: 315px !important;
@@ -6828,9 +6961,10 @@ a.btnReport:hover {
   left: 0px;
 }
 .bx-wrapper .bx-viewport {
-  width:99%;
+  width: 99%;
   left: 0px;
   background: #fff;
+  /*fix other elements on the page moving (on Chrome)*/
   -webkit-transform: translatez(0);
   -moz-transform: translatez(0);
   -ms-transform: translatez(0);
@@ -6888,7 +7022,7 @@ a.btnReport:hover {
 .filter-search-show {
   display: block !important;
 }
-.emailTemplatesPopupTableContainer .listViewEntries  .listViewEntryValue {
+.emailTemplatesPopupTableContainer .listViewEntries .listViewEntryValue {
   max-width: 100%;
   min-width: 150px;
 }
@@ -6923,12 +7057,15 @@ input:focus::-webkit-input-placeholder {
 input:focus:-moz-placeholder {
   color: transparent;
 }
+/* FF 4-18 */
 input:focus::-moz-placeholder {
   color: transparent;
 }
+/* FF 19+ */
 input:focus:-ms-input-placeholder {
   color: transparent;
 }
+/* IE 10+ */
 .global-actions .dropdown-menu:before {
   position: absolute;
   top: -7px;
@@ -6937,7 +7074,7 @@ input:focus:-ms-input-placeholder {
   border-right: 7px solid transparent;
   border-bottom: 7px solid #ccc;
   border-left: 7px solid transparent;
-  border-bottom-color: rgba(0,0,0,0.2);
+  border-bottom-color: rgba(0, 0, 0, 0.2);
   content: '';
 }
 .global-actions .dropdown-menu:after {
@@ -7122,6 +7259,7 @@ input:focus:-ms-input-placeholder {
   text-align: center;
 }
 #OnBoardLayout #OnBoardPageContainer .crmGoals textarea::-webkit-input-placeholder {
+  /* WebKit browsers */
   text-align: center;
   padding: 20%;
   font-size: 12px;
@@ -7282,7 +7420,7 @@ div.flip {
   background-color: #fff !important;
   border: 1px solid #f2e8fc;
   border-radius: 4px;
-  box-shadow: 0 1px 1px rgba(0,0,0,0.05);
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
   margin-bottom: 10px;
   font-size: 13px !important;
   text-align: justify;
@@ -7398,121 +7536,6 @@ div.flip {
   max-width: 100%;
   overflow-x: auto;
 }
-.fieldValue .value a {
-  color: #15c !important;
-}
-.editViewContents .fieldLabel {
-  min-width: 100px;
-  width: 20%;
-  word-break: break-all;
-}
-.editViewContents .fieldValue {
-  width:30%;
-}
-.editViewContents td.fieldValue[colspan="3"] {
-  width:80%;
-}
-.editViewContents textarea.textAreaElement {
-  width: 88%;
-}
-.editViewContents input[type="checkbox"] {
-  width: 15px;
-  height: 15px;
-}
-.editViewContents input[type="radio"] {
-  width: 15px;
-  height: 15px;
-}
-#composeEmailContainer .modal-body .quickCreateContent,
-#QuickCreate .modal-body .quickCreateContent,
-#create .quickCreateContent {
-  margin-top: 25px;
-}
-.settingsgroup-panel .widgetContainer .menuItemLabel .pinUnpinShortCut {
-  display: none;
-  margin-top: 2px;
-}
-.settingsgroup-panel .widgetContainer .menuItemLabel:hover .pinUnpinShortCut {
-  display: inline-block;
-}
-@-moz-document url-prefix() {
-  .duplicateHandlingContainer .tooltip-inner {
-    width: 550px;
-    max-width: 550px;
-  }
-}
-.duplicateHandlingContainer .tooltip-inner {
-  text-align: left !important;
-}
-.duplicateHandlingContainer .syncMessage {
-  margin-top: 5px !important;
-}
-.duplicateHandlingContainer .actionsList {
-  width: 230px !important;
-}
-.duplicationMessageContainer {
-  background-color: #f2dede !important;
-  color: #b94a48 !important;
-}
-.duplicationMessageContainer .duplicationMessageHeader {
-  margin-bottom: 8px;
-}
-.listViewRecordActions .quickView, .listViewRecordActions .markStar,
-.listViewRecordActions .markAsHeld,.listViewRecordActions .holdFollowupOn {
-  margin-top: 4px;
+.caseRelatedRecords {
+  margin-bottom: 0px !important;
 }
-.app-menu .module-icon .custom-module {
-	font-size: 14px;
-	border-radius: 4px;
-	color: #000;
-	background-color: #fff;
-	padding: 4px 10px 4px 5px !important
-}
-.menu-item .custom-module {
-	font-family: 'OpenSans-Regular', sans-serif;
-	font-size: 12px;
-	border-radius: 4px;
-	padding: 2px;
-	color: #000;
-	background-color: #fff;
-}
-.modules-menu .custom-module {
-	color: #fff;
-	margin-left: 0px;
-	display: inline;
-	border: 1px solid #fff;
-	border-radius: 4px;
-	padding: 3px 4px 3px 2px !important;
-	font-weight: bold;
-}
-#quickCreateModules .custom-module, .workflowListContainer .custom-module, .dashBoardTabContents .custom-module {
-	border-radius: 4px;
-	padding: 3px 5px;
-	color: #fff;
-	background-color: #777;
-}
-.menuEditorItem .custom-module {
-	border-radius: 4px;
-	padding: 3px 5px;
-	color: #000;
-	background-color: #fff;
-}
-.task-details .custom-module {
-	border-radius: 4px;
-	padding: 1px 4px;
-	color: white;
-	background-color: #777;
-}
-.related-tabs .custom-module, #relatedmenuList .custom-module {
-	border-radius: 4px;
-	color: #fff;
-	background-color: #777;
-	padding: 5px 7px;
-	font-weight: bold;
-}
-.record-header .custom-module {
-	font-size: 30px;
-}
-.moduleIcon .custom-module {
-	font-weight: bold;
-}
\ No newline at end of file
diff --git a/layouts/v7/skins/tools/style.css b/layouts/v7/skins/tools/style.css
index 0f56c1ee17daf9d3bd7e9490949f7e11def2f587..57b4c48fea1699ad54ae4a29e95a874d83c3d3b7 100644
--- a/layouts/v7/skins/tools/style.css
+++ b/layouts/v7/skins/tools/style.css
@@ -1,7 +1,9 @@
 @font-face {
   font-family: 'Oswald';
   src: url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.eot');
-  src: url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.eot?#iefix') format('embedded-opentype'), url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.woff') format('woff'), url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.ttf') format('truetype'), url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.svg#Oswald') format('svg');
+  /* IE9 Compat Modes */
+  src: url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/Oswald/Oswald-Regular/Oswald-Regular.svg#Oswald') format('svg');
+  /* Legacy iOS */
   font-weight: normal;
   font-style: normal;
   text-rendering: optimizeLegibility;
@@ -15,27 +17,37 @@ a:active {
 @font-face {
   font-family: 'OpenSans-Regular';
   src: url('../fonts/OpenSans/Regular/OpenSans-Regular.eot');
-  src: url('../fonts/OpenSans/Regular/OpenSans-Regular.ttf') format('truetype'), url('../fonts/OpenSans/Regular/OpenSans-Regular.eot?#iefix') format('embedded-opentype'), url('../fonts/OpenSans/Regular/OpenSans-Regular.woff2') format('woff2'), url('../fonts/OpenSans/Regular/OpenSans-Regular.woff') format('woff'), url('../fonts/OpenSans/Regular/OpenSans-Regular.svg#svgFontName') format('svg');
+  /* IE9 Compat Modes */
+  src: url('../fonts/OpenSans/Regular/OpenSans-Regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/OpenSans/Regular/OpenSans-Regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/OpenSans/Regular/OpenSans-Regular.woff2') format('woff2'), /* Super Modern Browsers */ url('../fonts/OpenSans/Regular/OpenSans-Regular.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/OpenSans/Regular/OpenSans-Regular.svg#svgFontName') format('svg');
+  /* Legacy iOS */
 }
 @font-face {
   font-family: 'OpenSans-Semibold';
   src: url('../fonts/OpenSans/Semibold/OpenSans-Semibold.eot');
-  src: url('../fonts/OpenSans/Semibold/OpenSans-Semibold.ttf') format('truetype'), url('../fonts/OpenSans/Semibold/OpenSans-Semibold.eot?#iefix') format('embedded-opentype'), url('../fonts/OpenSans/Semibold/OpenSans-Semibold.woff2') format('woff2'), url('../fonts/OpenSans/Semibold/OpenSans-Semibold.woff') format('woff'), url('../fonts/OpenSans/Semibold/OpenSans-Semibold.svg#svgFontName') format('svg');
+  /* IE9 Compat Modes */
+  src: url('../fonts/OpenSans/Semibold/OpenSans-Semibold.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/OpenSans/Semibold/OpenSans-Semibold.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/OpenSans/Semibold/OpenSans-Semibold.woff2') format('woff2'), /* Super Modern Browsers */ url('../fonts/OpenSans/Semibold/OpenSans-Semibold.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/OpenSans/Semibold/OpenSans-Semibold.svg#svgFontName') format('svg');
+  /* Legacy iOS */
 }
 @font-face {
   font-family: 'ProximaNova-Regular';
-  src: url('../fonts/ProximanovaWebfont/ProximaNova-Regular.ttf') format('truetype'), url('../fonts/ProximanovaWebfont/ProximaNova-Regular.woff') format('woff'), url('../fonts/ProximanovaWebfont/ProximaNova-Regular.eot?#iefix') format('embedded-opentype');
+  src: url('../fonts/ProximanovaWebfont/ProximaNova-Regular.ttf') format('truetype'), url('../fonts/ProximanovaWebfont/ProximaNova-Regular.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/ProximanovaWebfont/ProximaNova-Regular.eot?#iefix') format('embedded-opentype');
+  /* IE6-IE8 */
+  /* Safari, Android, iOS */
   font-style: normal;
   font-weight: normal;
   text-rendering: optimizeLegibility;
 }
 @font-face {
   font-family: 'ProximaNova-Semibold';
-  src: url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.ttf') format('truetype'), url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.woff') format('woff'), url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.eot?#iefix') format('embedded-opentype');
+  src: url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.woff') format('woff'), /* Pretty Modern Browsers */ url('../fonts/ProximanovaWebfont/ProximaNova-Semibold.eot?#iefix') format('embedded-opentype');
+  /* IE6-IE8 */
   font-style: normal;
   font-weight: normal;
   text-rendering: optimizeLegibility;
 }
+/**********************************/
+/************ Layout **************/
+/**********************************/
 html {
   height: 100%;
   overflow-y: auto;
@@ -102,6 +114,7 @@ body {
 @media (min-width: 992px) {
   .global-nav .logo-container {
     display: inline-block;
+    width: 150px;
     z-index: 2;
     padding-left: 6%;
     margin-top: 1px;
@@ -113,11 +126,13 @@ body {
     position: absolute;
     width: 100%;
     height: 42px;
+    /*        border-top:1px solid #ddd;*/
     border-bottom: 1px solid #ddd;
   }
   .app-nav .module-action-bar .module-action-content {
     background: #FBFBFB;
     height: 41px;
+    /*        border-bottom: 1px solid #eee;*/
   }
   .app-nav .module-action-bar .module-action-content .navbar-right {
     margin-right: 0;
@@ -163,7 +178,7 @@ body {
     padding-left: 0;
   }
 }
-.btn-toolbar >.btn-group:first-child {
+.btn-toolbar > .btn-group:first-child {
   margin-left: 5px;
 }
 .vt-notification {
@@ -196,15 +211,19 @@ body {
 .vt-notification [data-notify="message"] {
   color: #eaeaea;
 }
+/**********************************/
+/******** Navigation styles *******/
+/**********************************/
 .company-logo {
   height: 40px;
+  width: 150px;
   margin: 0 0;
   display: inline-block;
   margin-left: 1px;
 }
 .company-logo img {
-  max-height: 100%;
-  max-width: 100%;
+  height: 100%;
+  width: auto;
 }
 .navbar .fa {
   font-size: 15px;
@@ -214,10 +233,13 @@ body {
   font-size: 16px;
   position: relative;
 }
+/*.module-action-bar .module-action-content #appnav{
+    padding-top:5px;
+}*/
 .global-nav .navbar-nav > li div a {
   padding: 15px;
 }
-.global-nav>ul {
+.global-nav > ul {
   margin-right: 20px;
 }
 .global-nav .search-links-container {
@@ -267,26 +289,28 @@ body {
     float: right;
     height: 42px;
   }
-  .module-action-bar .navbar-right .nav>li {
+  .module-action-bar .navbar-right .nav > li {
     display: inline-block;
   }
-  .module-action-bar .navbar-right .nav>li a {
+  .module-action-bar .navbar-right .nav > li a {
     padding: 0 10px;
   }
   .global-nav .logo-container {
     border-bottom: 0;
+    width: 150px;
   }
 }
 @media (max-width: 991px) {
   .global-nav .logo-container {
     border-bottom: 0;
+    width: 150px;
   }
   .notificationMessageHolder {
     padding-left: 45%;
   }
 }
 @media (min-width: 991px) {
-  .nav>li>a.qc-button {
+  .nav > li > a.qc-button {
     padding: 2px 3px;
     margin-top: 13px;
     margin-right: 15px;
@@ -294,7 +318,7 @@ body {
     color: #fff;
     border-radius: 20px;
   }
-  .nav>li>a.qc-button span {
+  .nav > li > a.qc-button span {
     vertical-align: top;
   }
 }
@@ -313,6 +337,7 @@ body {
   width: 100%;
   height: 100%;
 }
+/** App Nav Styles */
 .active-app-title {
   white-space: nowrap;
   font-family: Oswald, "OpenSans-Semibold", "Helvetica Neue", Helvetica, sans-serif;
@@ -367,7 +392,9 @@ body {
   height: 42px;
   text-align: center;
   line-height: 42px;
+  /*    background-color: #2c3b49;*/
   color: #ffffff;
+  /*border-bottom: 1px solid #272B46;*/
 }
 .app-nav .app-indicator-icon-container .app-indicator-icon {
   font-size: 24px;
@@ -479,16 +506,16 @@ body {
   right: -4px;
 }
 #overlayPageContent .mCSB_scrollTools,
-#overlayPageContent .mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar,
-#overlayPageContent .mCSB_scrollTools .mCSB_buttonUp,
-#overlayPageContent .mCSB_scrollTools .mCSB_buttonDown,
-#overlayPageContent .mCSB_scrollTools .mCSB_buttonLeft,
-#overlayPageContent .mCSB_scrollTools .mCSB_buttonRight,
 .app-list .mCSB_scrollTools,
+#overlayPageContent .mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar,
 .app-list .mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar,
+#overlayPageContent .mCSB_scrollTools .mCSB_buttonUp,
 .app-list .mCSB_scrollTools .mCSB_buttonUp,
+#overlayPageContent .mCSB_scrollTools .mCSB_buttonDown,
 .app-list .mCSB_scrollTools .mCSB_buttonDown,
+#overlayPageContent .mCSB_scrollTools .mCSB_buttonLeft,
 .app-list .mCSB_scrollTools .mCSB_buttonLeft,
+#overlayPageContent .mCSB_scrollTools .mCSB_buttonRight,
 .app-list .mCSB_scrollTools .mCSB_buttonRight {
   -webkit-transition: none;
   transition: none;
@@ -700,6 +727,7 @@ a.menu-item:hover {
   width: 0px;
   overflow: hidden;
 }
+/* User Logout */
 .logout-content {
   padding: 10px;
   width: 350px;
@@ -754,6 +782,9 @@ a.menu-item:hover {
 .app-settings {
   background: #FFFFFF;
 }
+/*************************************************/
+/******** View styles (List/Edit/Detail..) *******/
+/*************************************************/
 .viewContent .content-area {
   padding-left: 50px;
 }
@@ -791,7 +822,6 @@ a.menu-item:hover {
 .fieldValue .value {
   max-width: 85%;
   display: inline-block;
-  word-break: break-word;
 }
 .modal-header button.close {
   padding: 0;
@@ -865,6 +895,9 @@ input[type="password"].inputElement {
   padding-right: 20px;
   padding-left: 20px;
 }
+/**********************************/
+/**** Side vertical Nav styles ****/
+/**********************************/
 .module-nav {
   background: #fff;
   z-index: 1004;
@@ -880,6 +913,9 @@ input[type="password"].inputElement {
   left: 0;
   transition: 0s width;
 }
+.module-nav:hover {
+  /*z-index: 1001;*/
+}
 .modules-menu ul {
   list-style: none;
   margin-left: 0;
@@ -914,7 +950,7 @@ input[type="password"].inputElement {
   float: left;
   font-size: 20px;
 }
-.modules-menu ul li a>span {
+.modules-menu ul li a > span {
   margin-left: 10px;
   vertical-align: middle;
   font-size: 13px;
@@ -954,6 +990,7 @@ input[type="password"].inputElement {
   width: 100%;
   left: 0%;
 }
+/** Lists Menu in Side bar */
 .module-filters .settings-sidebar,
 .module-filters .sidebar-container {
   padding: 0 12px;
@@ -987,6 +1024,7 @@ input[type="password"].inputElement {
 .lists-menu-container hr {
   margin: 5px 0;
 }
+/* mScrollbar customization for lists widget */
 .lists-menu-container .menu-scroller .mCSB_scrollTools {
   width: 13px;
 }
@@ -998,8 +1036,10 @@ input[type="password"].inputElement {
 .modules-menu .mCSB_scrollTools .mCSB_draggerContainer {
   left: 8px;
 }
+/* Customization ends */
 .lists-menu-container .list-menu-content .more-less-link {
   color: #fff;
+  /*text-decoration: none;*/
 }
 .lists-menu-container .list-menu-content .sub-header {
   color: #ddd;
@@ -1104,9 +1144,11 @@ input[type="password"].inputElement {
 .common-links-container > div a {
   color: #fff;
 }
+/*Search Container styles */
 .search-container {
   min-height: 300px;
   position: absolute;
+  /*z-index: 1030;*/
   width: 100%;
   top: 0;
   background: #FBFBFB;
@@ -1125,6 +1167,7 @@ input[type="password"].inputElement {
 .footer p {
   margin: 5px 0;
 }
+/*** Utilities ***/
 .showElement {
   display: block !important;
   height: 100%;
@@ -1247,11 +1290,11 @@ ul.unstyled {
 }
 .emptyRecordsDiv .emptyRecordsContent {
   display: inline-block;
-  font-size: 16px;
   left: 50%;
   margin-left: -25%;
   position: absolute;
   width: 50%;
+  font-size: 16px;
 }
 .textOverflowEllipsis {
   overflow: hidden;
@@ -1276,6 +1319,9 @@ ul.unstyled {
 .removeNoFileChosen {
   color: transparent !important;
 }
+/***********************************
+**********Button Styles**********
+***********************************/
 .module-buttons-container {
   float: right;
   margin-right: 10px;
@@ -1297,6 +1343,7 @@ ul.unstyled {
   margin: 4px 2px;
   border-radius: 2px;
   border: 1px solid #ddd;
+  text-transform: uppercase;
   color: #666;
   background: #fff;
 }
@@ -1317,6 +1364,9 @@ ul.unstyled {
   color: #FFFFFF !important;
   background: #5bc0de !important;
 }
+/***********************************
+**********List View Styles**********
+***********************************/
 .fa.pull-left {
   margin-right: 0;
 }
@@ -1351,7 +1401,7 @@ ul.unstyled {
   font-size: 20px;
 }
 .listview-pagination .disabled {
-  color: rgba(0,0,0,0.2);
+  color: rgba(0, 0, 0, 0.2);
 }
 .listview-pagination .disabled:hover {
   cursor: default;
@@ -1379,6 +1429,8 @@ ul.unstyled {
 .listview-table {
   margin-bottom: 0;
   border-top: 0;
+  /* Horizontal scroll will not work if table layout Fixed */
+  /*    table-layout: fixed;*/
 }
 .listview-table tr td,
 .listview-table tr th {
@@ -1408,7 +1460,7 @@ ul.unstyled {
   width: 100%;
 }
 .listViewEntries .relatedListEntryValues .fieldValue .value,
-.listViewEntries  .listViewEntryValue .fieldValue .value {
+.listViewEntries .listViewEntryValue .fieldValue .value {
   vertical-align: middle;
   width: 100%;
   display: inline-block;
@@ -1423,7 +1475,7 @@ ul.unstyled {
 }
 .listview-table-norecords .table-actions,
 .listview-table .table-actions {
-  width: 120px;
+  width: 110px;
   font-size: 15px;
   color: #555;
   margin-left: 7px;
@@ -1489,13 +1541,13 @@ input[type=checkbox]:checked {
   vertical-align: middle;
   display: table-cell;
 }
-.listview-table  tr.searchRow th {
+.listview-table tr.searchRow th {
   padding: 5px 3px;
 }
-.listview-table  tr.searchRow th.inline-search-btn {
+.listview-table tr.searchRow th.inline-search-btn {
   padding: 3px 10px;
 }
-.listview-table  tr.searchRow th.inline-search-btn button {
+.listview-table tr.searchRow th.inline-search-btn button {
   text-align: center;
   width: 85%;
   text-shadow: none;
@@ -1523,6 +1575,18 @@ input[type=checkbox]:checked {
   background-color: #FFEEEE !important;
   background-image: none !important;
 }
+/*.floatThead-wrapper .table-container{
+    z-index: 0 !important;
+}*/
+/* List view bottom fixed scroll */
+/*.bottom-fixed-scroll{
+    height: 14px;
+    position: relative;
+    top: -15px;
+    overflow-x: auto;
+    overflow-y: hidden;
+    width: 100%;
+}*/
 .scroller-div {
   height: 1px;
 }
@@ -1644,12 +1708,12 @@ input[type=checkbox]:checked {
 #listColumnFilterContainer .disabled i {
   color: #ccc;
 }
+/**********************************
+**********Detail View Styles**********
+**********************************/
 .detailViewButtoncontainer {
   padding-top: 5px;
 }
-.detailViewButtoncontainer button.btn {
-  margin: 0px 1px !important;
-}
 .detailview-header .recordBasicInfo > .info-row {
   margin-bottom: 4px;
 }
@@ -1730,9 +1794,6 @@ th {
   margin-top: 3%;
   margin-right: 2%;
 }
-.overlayDetailHeader button.btn {
-  margin: 0px 1px !important;
-}
 .referencefield-wrapper .createReferenceRecord {
   float: left;
   margin-left: 5px;
@@ -1972,10 +2033,10 @@ th {
   z-index: 1030;
 }
 .overlay-container-60 {
-  margin-left: 42px;
+  margin-left: 42px ;
 }
 .overlay-container-300 {
-  margin-left: 230px;
+  margin-left: 230px ;
 }
 .overlayPageContent {
   background: #FFFFFF;
@@ -2098,6 +2159,9 @@ th {
   height: 26px;
   line-height: 25px;
 }
+/**********************************
+**********Summary View Styles******
+**********************************/
 .summary-table {
   width: 100%;
   table-layout: fixed;
@@ -2218,33 +2282,33 @@ th {
   opacity: 1;
   cursor: pointer;
 }
-.details.row >form .social-media-toggle {
+.details.row > form .social-media-toggle {
   position: absolute;
   right: -15px;
   display: inline-block;
   width: 500px;
   border-left: 0px;
 }
-.details.row >form .social-media-widget {
+.details.row > form .social-media-widget {
   border-left: 1px solid #ddd;
   border-bottom: 1px solid #ddd;
   height: 100%;
   background: white;
 }
-.details.row >form div[class*="col-"].resizable-summary-view {
+.details.row > form div[class*="col-"].resizable-summary-view {
   padding-left: 0;
   padding-right: 0px;
 }
-.details.row >form>div[class*="col-"],
-.details.row >form .resizable-summary-view div[class*="col-"] {
+.details.row > form > div[class*="col-"],
+.details.row > form .resizable-summary-view div[class*="col-"] {
   padding-right: 0;
   padding: 0px 5px;
 }
-.details.row >form>div[class*="col-"]:first-child,
-.details.row >form .left-block {
+.details.row > form > div[class*="col-"]:first-child,
+.details.row > form .left-block {
   padding-left: 0 !important;
 }
-.details.row >form>div[class*="col-"]:last-child {
+.details.row > form > div[class*="col-"]:last-child {
   padding-right: 0;
 }
 .summaryWidgetContainer .noContent {
@@ -2257,6 +2321,9 @@ th {
 .caseReplyArea .nav > li {
   padding: 0 10px;
 }
+/**********************************
+**********Edit View Styles*******
+**********************************/
 .main-container .editViewModNavigator.module-nav,
 .editViewModNavigator .mod-switcher-container,
 .editViewModNavigator .modules-menu {
@@ -2297,7 +2364,7 @@ th {
   width: 100%;
 }
 .editViewContents .input-group {
-  width: 229px;
+  width: 208px;
   float: left;
 }
 .input-group.inputElement .input-group-addon {
@@ -2376,6 +2443,9 @@ th {
   z-index: 1000;
   padding: 7px;
 }
+/**********************************
+**********Advance Search styles**********
+**********************************/
 .op0.fadeInx {
   opacity: 1;
 }
@@ -2448,7 +2518,11 @@ th {
 }
 .btn + input {
   margin-left: 5px;
+  /*    margin-top : 3px;*/
 }
+/**********************************
+**********Extension Store Styles**********
+**********************************/
 .extensionstore .app-trigger {
   width: 98%;
 }
@@ -2479,6 +2553,9 @@ th {
 .extensionContents .extensionError {
   color: #F10404;
 }
+/**********************************
+**********Extension Store Nav Bar**********
+**********************************/
 .tabbable-line > .nav-tabs {
   border: none;
   margin: 0px;
@@ -2547,6 +2624,9 @@ th {
 .extensionContents .listview-table {
   width: 100%;
 }
+/*******************************************
+******Detail View related list styles*******
+********************************************/
 .relatedContents .listViewContentHeaderValues:hover {
   text-decoration: none;
   color: #333;
@@ -2604,6 +2684,9 @@ th {
 .relatedViewActions .btn-group {
   margin-right: 15px;
 }
+/*******************************************
+****************** Modal *******************
+********************************************/
 .modal-header {
   padding: 5px 15px;
   background: #596875;
@@ -2631,6 +2714,7 @@ th {
   width: 100%;
   float: left;
   background: #596875;
+  /*    height: 100%;*/
 }
 .settings-menu {
   display: inline-block;
@@ -2647,7 +2731,7 @@ th {
   cursor: n-resize;
 }
 .settings-menu-items {
-  box-shadow: 0 1px 1px rgba(0,0,0,0.05);
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
   margin-bottom: 10px;
   text-align: justify;
 }
@@ -2765,9 +2849,6 @@ th {
 .active .stepNum {
   color: #FFFFFF;
 }
-.mailBoxEditDiv .crumbs li {
-  width: 22%;
-}
 .stepNum {
   display: inline-block;
   padding: 0 5px;
@@ -2776,6 +2857,7 @@ th {
   vertical-align: middle;
   color: #3399ff;
 }
+/* .squaredFour */
 .squaredFour {
   width: 20px;
   position: relative;
@@ -2789,9 +2871,9 @@ th {
   top: 0;
   left: 0;
   background: #fcfff4;
-  background: linear-gradient(top,#fcfff4 0%,#dfe5d7 40%,#b3bead 100%);
+  background: linear-gradient(top, #fcfff4 0%, #dfe5d7 40%, #b3bead 100%);
   border-radius: 4px;
-  box-shadow: inset 0px 1px 1px white, 0px 1px 3px rgba(0,0,0,0.5);
+  box-shadow: inset 0px 1px 1px white, 0px 1px 3px rgba(0, 0, 0, 0.5);
 }
 .squaredFour label:after {
   content: '';
@@ -2819,13 +2901,16 @@ th {
 .importBlockContainer {
   color: #596875;
 }
+/******************************************* 
+************* Social Buttons *************** 
+********************************************/
 .btn-block + .btn-block {
   margin-top: 5px;
 }
 .btn-google-plus {
   color: #FFFFFF !important;
   background-color: #DD4B39;
-  border-color: rgba(0,0,0,0.2);
+  border-color: rgba(0, 0, 0, 0.2);
 }
 .btn-social {
   position: relative;
@@ -2844,15 +2929,18 @@ th {
   line-height: 34px;
   font-size: 1.6em;
   text-align: center;
-  border-right: 1px solid rgba(0,0,0,0.2);
+  border-right: 1px solid rgba(0, 0, 0, 0.2);
 }
+/******************************************* 
+************* Updates Timeline *************** 
+********************************************/
 .recentActivitiesContainer .history {
   margin: 0 auto;
   padding: 20px 20px 1px;
   max-width: 100%;
   overflow-x: visible;
-  -webkit-transition: opacity .2s ease-out;
-  transition: opacity .2s ease-out;
+  -webkit-transition: opacity 0.2s ease-out;
+  transition: opacity 0.2s ease-out;
 }
 .updates_timeline {
   padding-top: 20px;
@@ -2861,6 +2949,7 @@ th {
   padding: 0;
   list-style: none;
 }
+/* The line */
 .updates_timeline:before {
   content: '';
   position: absolute;
@@ -2879,6 +2968,7 @@ th {
   min-height: 40px;
   z-index: 2;
 }
+/* Left Content(Time) */
 .updates_timeline > li .update_time {
   position: absolute;
   margin: 0;
@@ -2890,6 +2980,7 @@ th {
   font-size: 15px;
   font-style: italic;
 }
+/* Right content(Update info) */
 .updates_timeline > li .update_info {
   padding: 10px 10px 1px;
   display: block;
@@ -2898,10 +2989,11 @@ th {
   position: relative;
   top: -45px;
 }
-.updates_timeline > li .update_info >h3 {
+.updates_timeline > li .update_info > h3 {
   font-size: 1.1em;
   margin-left: -3%;
 }
+/* The icons  */
 .updates_timeline > li .update_icon {
   position: relative;
   border-radius: 50%;
@@ -2914,6 +3006,7 @@ th {
   color: #fff;
   line-height: 35px;
 }
+/* More Button */
 .updates_timeline #more_button .update_icon {
   position: relative;
   border-radius: 0;
@@ -3021,6 +3114,9 @@ th {
   vertical-align: super;
   font-size: 13px;
 }
+/******************************************* 
+************* Task Management ************** 
+********************************************/
 #taskManagementContainer .data-body {
   margin-bottom: 50px;
 }
@@ -3083,15 +3179,16 @@ th {
 #taskManagementContainer .other-details {
   color: #979797;
 }
+/*overwriting jquery ui css*/
 .ui-menu {
   z-index: 10000;
 }
 #taskManagementContainer button.active {
   background: #3B83F7;
   color: white;
-  text-shadow: 0 1px rgba(0,0,0,0.3);
+  text-shadow: 0 1px rgba(0, 0, 0, 0.3);
   border: 1px solid #135fd7;
-  box-shadow: inset 0 1px 2px rgba(0,0,0,0.3);
+  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.3);
 }
 .taskSubject {
   width: 99%;
@@ -3099,6 +3196,9 @@ th {
 #taskManagementContainer .mCustomScrollbar .mCSB_inside > .mCSB_container {
   margin-right: 13px;
 }
+/******************************************* 
+************* Settings Page ************** 
+********************************************/
 .settingsPageDiv.content-area {
   margin-right: 0;
 }
@@ -3132,6 +3232,9 @@ th {
 .settingsgroup-accordion a i {
   margin-right: 5px;
 }
+.settingsgroup-accordion a span {
+  text-transform: uppercase;
+}
 .settingsgroup {
   background: #2C3B49;
   height: 100%;
@@ -3288,35 +3391,59 @@ th {
 }
 .mini-slider-control[data-value="0"] .ui-slider-handle {
   background: #7d7e7d;
-  background: -moz-linear-gradient(top,#7d7e7d 0%,#0e0e0e 100%);
-  background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#7d7e7d),color-stop(100%,#0e0e0e));
-  background: -webkit-linear-gradient(top,#7d7e7d 0%,#0e0e0e 100%);
-  background: -o-linear-gradient(top,#7d7e7d 0%,#0e0e0e 100%);
-  background: -ms-linear-gradient(top,#7d7e7d 0%,#0e0e0e 100%);
-  background: linear-gradient(to bottom,#7d7e7d 0%,#0e0e0e 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#7d7e7d',endColorstr='#0e0e0e',GradientType=0);
+  /* Old browsers */
+  background: -moz-linear-gradient(top, #7d7e7d 0%, #0e0e0e 100%);
+  /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #7d7e7d), color-stop(100%, #0e0e0e));
+  /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #7d7e7d 0%, #0e0e0e 100%);
+  /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top, #7d7e7d 0%, #0e0e0e 100%);
+  /* Opera 11.10+ */
+  background: -ms-linear-gradient(top, #7d7e7d 0%, #0e0e0e 100%);
+  /* IE10+ */
+  background: linear-gradient(to bottom, #7d7e7d 0%, #0e0e0e 100%);
+  /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#7d7e7d', endColorstr='#0e0e0e', GradientType=0);
+  /* IE6-9 */
   margin-left: 0px;
 }
 .mini-slider-control[data-value="1"] .ui-slider-handle {
   background: #ffb76b;
-  background: -moz-linear-gradient(top,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#ffb76b),color-stop(0%,#ffa73d),color-stop(49%,#ff7c00),color-stop(100%,#ff7f04));
-  background: -webkit-linear-gradient(top,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  background: -o-linear-gradient(top,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  background: -ms-linear-gradient(top,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  background: linear-gradient(to bottom,#ffb76b 0%,#ffa73d 0%,#ff7c00 49%,#ff7f04 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffb76b',endColorstr='#ff7f04',GradientType=0);
+  /* Old browsers */
+  background: -moz-linear-gradient(top, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffb76b), color-stop(0%, #ffa73d), color-stop(49%, #ff7c00), color-stop(100%, #ff7f04));
+  /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* Opera 11.10+ */
+  background: -ms-linear-gradient(top, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* IE10+ */
+  background: linear-gradient(to bottom, #ffb76b 0%, #ffa73d 0%, #ff7c00 49%, #ff7f04 100%);
+  /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffb76b', endColorstr='#ff7f04', GradientType=0);
+  /* IE6-9 */
   margin-left: -6px;
 }
 .mini-slider-control[data-value="2"] .ui-slider-handle {
   background: #bfd255;
-  background: -moz-linear-gradient(top,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#bfd255),color-stop(79%,#8eb92a),color-stop(100%,#72aa00),color-stop(100%,#9ecb2d));
-  background: -webkit-linear-gradient(top,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  background: -o-linear-gradient(top,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  background: -ms-linear-gradient(top,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  background: linear-gradient(to bottom,#bfd255 0%,#8eb92a 79%,#72aa00 100%,#9ecb2d 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bfd255',endColorstr='#9ecb2d',GradientType=0);
+  /* Old browsers */
+  background: -moz-linear-gradient(top, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #bfd255), color-stop(79%, #8eb92a), color-stop(100%, #72aa00), color-stop(100%, #9ecb2d));
+  /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* Opera 11.10+ */
+  background: -ms-linear-gradient(top, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* IE10+ */
+  background: linear-gradient(to bottom, #bfd255 0%, #8eb92a 79%, #72aa00 100%, #9ecb2d 100%);
+  /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bfd255', endColorstr='#9ecb2d', GradientType=0);
+  /* IE6-9 */
   margin-left: -13px;
 }
 .ModulemanagerSettings .moduleblock .hiden {
@@ -3341,10 +3468,13 @@ th {
 th {
   padding: 6px;
 }
+/******************************************* 
+********** CustomerPortal styles start ********
+********************************************/
 .cp-tabs .enabledModules {
   display: inline-block ! important;
-  margin-left: 4px !important;
-  margin-right: 4px !important;
+  margin-left: 4px!important;
+  margin-right: 4px!important;
   vertical-align: top;
 }
 .drag-portal-module {
@@ -3451,7 +3581,7 @@ th {
   margin-left: 5px;
 }
 .portal-field-delete {
-  margin-left: 45px !important;
+  margin-left: 45px!important;
 }
 .portalModuleRow {
   border-left: 4px solid #2ECC71 !important;
@@ -3468,7 +3598,7 @@ th {
   content: "*";
   color: red;
 }
-.nav-tabs .cp-modules > .active >a,
+.nav-tabs .cp-modules > .active > a,
 .nav-tabs .cp-modules > .active > a:hover {
   border: 0px !important;
   border-top-right-radius: 0px;
@@ -3630,7 +3760,7 @@ th {
   display: inline-block;
 }
 .quickPreview .updates_timeline:before {
-  background: #e6e6e6;
+  background: #e5e5e5;
   width: 2px;
   margin-left: -1%;
 }
@@ -3645,13 +3775,16 @@ th {
 .quickPreviewComments .recentComments .commentDetails .comment {
   line-height: 15px;
 }
-.quickPreviewComments  .summaryWidgetContainer {
+.quickPreviewComments .summaryWidgetContainer {
   border: 0;
   padding: 0;
 }
 .quickPreview .recentActivitiesContainer .history {
   padding: 0;
 }
+/******************************************* 
+********** Calendar view styles ************
+********************************************/
 .calendar-sidebar {
   width: 100% !important;
 }
@@ -3808,6 +3941,11 @@ th {
   display: inline-block;
   text-align: center;
 }
+/******************************************* 
+********** Calendar view styles end ********
+
+********** Documents Module styles *********
+********************************************/
 .dragdrop-dotted {
   border: 2px dashed #C0C0C0;
   min-width: 300px;
@@ -3867,13 +4005,16 @@ tr.file > td.fileOwnerData {
   width: 100px;
   white-space: pre-wrap;
 }
+/******************************************* 
+********** Documents Module styles end *****
+********************************************/
 .engagementsContainer .engagements_content {
   padding-top: 15px;
 }
 .summaryWidgetContainer .engagementsContainer table {
   width: inherit;
 }
-.engagements_content table thead>tr:first-child {
+.engagements_content table thead > tr:first-child {
   border: 1px solid #CCC;
   background-color: #F5F5F5;
 }
@@ -3924,6 +4065,9 @@ tr.file > td.fileOwnerData {
   font-size: 15px;
   padding: 1% 0;
 }
+/******************************************* 
+********** Mailroom view styles start ********
+********************************************/
 .mailroomBanner {
   margin: 23px 0;
   height: 215px;
@@ -4132,6 +4276,7 @@ tr.file > td.fileOwnerData {
   margin-left: 0;
 }
 .mentionMessages .mention_follow_up {
+  /*//load this color from variable.less*/
   background-color: green;
 }
 .modelContainer .modal-content {
@@ -4280,6 +4425,7 @@ form[name="notification_settings"] .select2-choice {
   margin-left: 0;
 }
 .mentionMessages .mention_follow_up {
+  /*//load this color from variable.less*/
   background-color: green;
 }
 .modal-content .mention_followup .row {
@@ -4311,6 +4457,9 @@ form[name="notification_settings"] .select2-choice {
 .mentionMessageHeader .MultiFile-remove {
   color: #FFFFFF;
 }
+/******************************************* 
+********** Mailroom view styles end ********
+********************************************/
 .detailview-header {
   margin-bottom: 10px;
 }
@@ -4326,6 +4475,7 @@ form[name="notification_settings"] .select2-choice {
   margin: 0px 10px;
   text-decoration: underline !important;
   color: #3498DB;
+  /*font-size : 12px;*/
 }
 .tag {
   display: inline-block;
@@ -4409,11 +4559,10 @@ form[name="notification_settings"] .select2-choice {
   border: 1px solid #dcdcdc;
 }
 #tagCloud .tag {
-  color: #5ea9dd;
-  padding: 0px;
   background-color: #FFFFFF;
   border-color: #FFFFFF;
   border-radius: 0px;
+  color: #5ea9dd;
   margin: 3px;
 }
 #tagCloud .tag[data-type="public"] {
@@ -4424,6 +4573,9 @@ form[name="notification_settings"] .select2-choice {
   max-width: 80px;
   vertical-align: bottom;
 }
+/******************************************* 
+********** Groups view styles ********
+********************************************/
 #s2id_memberList li > div,
 .groupMembersColors li > div {
   margin-left: 10px;
@@ -4498,6 +4650,12 @@ form[name="notification_settings"] .select2-choice {
   margin: 0px;
   color: #444444;
 }
+/******************************************* 
+********** Groups view styles  ends********
+********************************************/
+/******************************************* 
+********** Picklist Css ********
+********************************************/
 .pickListValue {
   background-color: #FFFFFF;
 }
@@ -4512,6 +4670,12 @@ form[name="notification_settings"] .select2-choice {
   padding: 2px 1px !important;
   line-height: 15px;
 }
+/******************************************* 
+************* Dashboard Styles *************
+********************************************/
+li.dashboardWidget {
+  overflow: auto;
+}
 .dashboardWidgetHeader .title {
   padding-bottom: 10px;
   font-size: 15px;
@@ -4532,9 +4696,6 @@ form[name="notification_settings"] .select2-choice {
 .dashBoardContainer .tabContainer .tab-content {
   margin-top: 10px;
 }
-.dashBoardContainer .dashBoardTabContents ul {
-  margin: 0;
-}
 .dashBoardContainer .dashBoardTabContents ul li {
   border: 3px solid #E2E2E4;
   box-shadow: 1px;
@@ -4601,7 +4762,7 @@ form[name="notification_settings"] .select2-choice {
   display: inline-block;
   opacity: 1;
 }
-.dashBoardContainer .tabContainer li a  .deleteTab:hover {
+.dashBoardContainer .tabContainer li a .deleteTab:hover {
   cursor: pointer;
 }
 #minilistWizardContainer .fieldLabel {
@@ -4638,6 +4799,9 @@ form[name="notification_settings"] .select2-choice {
   resize: none;
   width: 100%;
 }
+/******************************************* 
+********** Picklist DependencyGraph ********
+********************************************/
 #dependencyGraph .tableHeading {
   text-align: center;
   padding-top: 30px;
@@ -4663,12 +4827,15 @@ form[name="notification_settings"] .select2-choice {
 #dependencyGraph .dependencyMapping .pickListDependencyTable .selectedCell {
   background: #a9cbf5;
 }
+/******************************************* 
+********** Rewriting select2 for consistency********
+********************************************/
 .select2-container .select2-choice {
   height: 29px;
   border-radius: 1px;
 }
 .modal {
-  z-index: 1100;
+  z-index: 1070;
 }
 .select2-container .select2-choice {
   height: 28px;
@@ -4756,6 +4923,7 @@ hr {
   position: fixed;
   bottom: 0;
   background: #EFEFEF;
+  /*width:100%;*/
   border-left: 42px solid #2c3b49;
   height: 60px;
   left: 0;
@@ -4774,7 +4942,6 @@ hr {
 }
 .settingsPageDiv .modal-overlay-footer {
   margin-left: 230px;
-  border-left: 0px solid;
 }
 .settingsOverlayContainer .modal-overlay-footer {
   margin: 0;
@@ -4797,14 +4964,14 @@ hr {
   vertical-align: middle;
   margin-top: 6px;
 }
-.list-menu-content .pull-right>.dropdown-menu {
+.list-menu-content .pull-right > .dropdown-menu {
   left: -126px;
   position: relative;
 }
-.dropdown-menu>li>a {
+.dropdown-menu > li > a {
   padding: 4px 6px;
 }
-.dropdown-menu>li>a span i {
+.dropdown-menu > li > a span i {
   font-size: 15px;
   vertical-align: middle;
 }
@@ -4812,11 +4979,11 @@ hr {
   max-height: 300px;
   padding-left: 0;
 }
-.related-tabs .dropdown-menu>.mCustomScrollBox>.mCSB_container {
+.related-tabs .dropdown-menu > .mCustomScrollBox > .mCSB_container {
   margin-right: 0;
   padding: 4px 6px;
 }
-.related-tabs .dropdown-menu>.mCustomScrollBox>.mCSB_container>li>a {
+.related-tabs .dropdown-menu > .mCustomScrollBox > .mCSB_container > li > a {
   display: block;
   padding: 3px 5px;
   clear: both;
@@ -4825,7 +4992,7 @@ hr {
   color: #333;
   white-space: nowrap;
 }
-.related-tabs .dropdown-menu>.mCustomScrollBox>.mCSB_container span i {
+.related-tabs .dropdown-menu > .mCustomScrollBox > .mCSB_container span i {
   font-size: 15px;
   vertical-align: middle;
 }
@@ -4848,16 +5015,16 @@ hr {
 .calendar-sidebar .calendar-sidebar-tabs.padding {
   padding-left: 20px !important;
 }
-.related-tabs.row .nav>li {
+.related-tabs.row .nav > li {
   padding: 0 10px;
   margin: 0 2px;
 }
-.massEditTabs.nav>li {
+.massEditTabs.nav > li {
   padding: 0 10px;
   margin: 0 4px;
 }
-.row .nav>li>a,
-.row .nav>li>a:hover {
+.row .nav > li > a,
+.row .nav > li > a:hover {
   padding: 10px 3px;
   border: none;
   vertical-align: bottom;
@@ -4867,38 +5034,39 @@ hr {
   -webkit-box-sizing: border-box;
   -o-box-sizing: border-box;
 }
-.row .nav>li>a:hover {
+.row .nav > li > a:hover {
   border-bottom-color: #555;
 }
-TN-34230
-
-.row .nav>li>a:hover {
+/*.row ul{
+    padding:0;
+}*/
+TN-34230 .row .nav > li > a:hover {
   border-bottom-color: #555;
   background: none;
 }
 .row ul li:first-child {
   margin-left: 0;
 }
-.related-tabs .nav-tabs>li.active,
-.related-tabs .nav-tabs>li:hover,
-.related-tabs .nav-tabs>li.active:focus,
-.dashBoardContainer .nav-tabs>li.active,
-.dashBoardContainer .nav-tabs>li:hover,
-.dashBoardContainer .nav-tabs>li.active:focus,
-.contents.tabbable .nav-tabs>li.active,
-.contents.tabbable .nav-tabs>li:hover,
-.contents.tabbable .nav-tabs>li.active:focus {
+.related-tabs .nav-tabs > li.active,
+.dashBoardContainer .nav-tabs > li.active,
+.contents.tabbable .nav-tabs > li.active,
+.related-tabs .nav-tabs > li:hover,
+.dashBoardContainer .nav-tabs > li:hover,
+.contents.tabbable .nav-tabs > li:hover,
+.related-tabs .nav-tabs > li.active:focus,
+.dashBoardContainer .nav-tabs > li.active:focus,
+.contents.tabbable .nav-tabs > li.active:focus {
   border: none;
   border-bottom: 3px solid #555;
 }
-.nav-tabs>li.active>a,
-.nav-tabs>li.active>a:hover,
-.nav-tabs>li.active>a:focus,
-.nav-tabs>li>a {
+.nav-tabs > li.active > a,
+.nav-tabs > li.active > a:hover,
+.nav-tabs > li.active > a:focus,
+.nav-tabs > li > a {
   border: 0;
 }
-.nav>li>a:hover,
-.nav>li>a:focus {
+.nav > li > a:hover,
+.nav > li > a:focus {
   background-color: #FFFFFF;
 }
 .fa-pencil,
@@ -4908,6 +5076,9 @@ TN-34230
 .commentAttachmentName {
   font-size: 11px;
 }
+/******************************************* 
+********** Layout Editor ********
+********************************************/
 .marginBottom10px {
   margin-bottom: 10px;
 }
@@ -4930,6 +5101,7 @@ TN-34230
 }
 .zeroOpacity {
   opacity: 0;
+  /*for IE*/
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
   filter: alpha(opacity=0);
 }
@@ -4956,10 +5128,12 @@ TN-34230
 .layoutContent .opacity:hover .actions {
   opacity: 1;
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
+  /*for IE*/
   filter: alpha(opacity=100);
 }
 .layoutContent .fieldPropertyContainer:hover .actions {
   opacity: 1;
+  /*for IE*/
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
   filter: alpha(opacity=100);
 }
@@ -4982,6 +5156,7 @@ TN-34230
 .relatedTabModulesList .addButton {
   border-radius: 2px;
   border: 1px solid #DDDDDD;
+  text-transform: uppercase;
   color: #666666;
   background: #FFFFFF;
 }
@@ -5055,6 +5230,9 @@ TN-34230
   margin-left: 5px;
   word-break: break-all;
 }
+/******************************************* 
+************** Tax Management **************
+********************************************/
 #TaxCalculationsContainer .table tr:first-child,
 .taxModalContainer #editTax .table tr:first-child {
   border-bottom: 1px solid #ccc;
@@ -5094,6 +5272,9 @@ TN-34230
   max-height: 500px;
   overflow-y: auto;
 }
+/******************************************* 
+********** Workflows ********
+********************************************/
 #workflow_edit .editViewBody {
   overflow: inherit;
 }
@@ -5103,7 +5284,7 @@ TN-34230
 }
 .timePicker {
   width: 9.5em !important;
-  z-index: 1101 !important;
+  z-index: 1070 !important;
 }
 .weekDaySelect .ui-state-default {
   background: inherit;
@@ -5141,75 +5322,6 @@ TN-34230
 .module-filters.active {
   background: #F7F7F7;
 }
-.payment-type-selection {
-  margin-bottom: 30px;
-}
-.payment-type-selection img {
-  vertical-align: middle;
-}
-.currplan {
-  padding: 10px 20px;
-  background-color: #f3f3f3;
-  border: 1px solid #eee;
-  border-radius: 3px;
-}
-.currplan div {
-  display: inline-block;
-  font-size: 16px;
-}
-.planName {
-  display: inline-block;
-  color: #fff;
-  padding: 20px;
-  margin: 10px 20px;
-  font-size: 24px;
-  border-radius: 2px;
-}
-.plan-heading {
-  min-height: 168px;
-}
-.plan-title {
-  color: #fff;
-  font-size: 20px;
-  padding: 13px 0;
-}
-#sales_plan {
-  background: #3FC380;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#salespremium_plan {
-  background: #00B16A;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#support_plan {
-  background: #2980B9;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#supportpremium_plan {
-  background: #2980B9;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#ultimate_plan,
-#exclusive_plan {
-  background: #F39C12;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
-#contact_plan {
-  background: #FF5959;
-  font-size: x-large;
-  text-shadow: 1px 0 2px #555555;
-  color: #fff;
-}
 .workflowListContainer .select2-container .select2-choice {
   height: 36px;
 }
@@ -5224,6 +5336,7 @@ TN-34230
 .contactAdd {
   border: 1px solid #eee;
   padding: 20px;
+  /*min-height: 310px !important;*/
 }
 #subDetails table td {
   padding: 7px 10px;
@@ -5346,9 +5459,9 @@ TN-34230
 .productBundles {
   padding-left: 20px;
 }
-.nav .open>a,
-.nav .open>a:hover,
-.nav .open>a:focus {
+.nav .open > a,
+.nav .open > a:hover,
+.nav .open > a:focus {
   color: #000000;
   background-color: #FFFFFF;
 }
@@ -5369,6 +5482,9 @@ TN-34230
   width: 100%;
   overflow-x: auto;
 }
+/******************************************* 
+*************** Mail Manager ***************
+********************************************/
 #mm_searchButton {
   height: 28px;
   background-color: #FFFFFF;
@@ -5424,8 +5540,8 @@ TN-34230
   padding: 1px 5px;
   border-radius: 3px;
   text-align: center;
-  text-shadow: 0 1px rgba(0,0,0,0.1);
-  background-image: -webkit-linear-gradient(top,#DD4B39 0,#D14836 100%);
+  text-shadow: 0 1px rgba(0, 0, 0, 0.1);
+  background-image: -webkit-linear-gradient(top, #DD4B39 0, #D14836 100%);
   border: 1px solid #C6322A;
   background-color: #DD4B39;
 }
@@ -5643,6 +5759,7 @@ TN-34230
 .width40per {
   width: 40%;
 }
+/****** Mail Manager Ends ******/
 .quickCreateContent .massEditTable textarea,
 .addCommentBlock .commentTextArea textarea {
   resize: vertical;
@@ -5655,19 +5772,20 @@ TN-34230
 .select2-container-multi .select2-choices {
   z-index: 1;
 }
-.nav .nav-stacks .cp-nav-header-wrapper>li.disabled>a:hover {
+/****** Customer Portal Settings ******/
+.nav .nav-stacks .cp-nav-header-wrapper > li.disabled > a:hover {
   background-color: #fff;
 }
-.cp-nav-header-wrapper>li.disabled>a:hover {
+.cp-nav-header-wrapper > li.disabled > a:hover {
   border: 0px ! important;
 }
-.nav .nav-stacks .cp-nav-header-wrapper>li.disabled>a {
+.nav .nav-stacks .cp-nav-header-wrapper > li.disabled > a {
   background-color: #fff;
 }
-#portalModulesTable>li.portalModuleRow.active>a:hover {
+#portalModulesTable > li.portalModuleRow.active > a:hover {
   background-color: #fff !important;
 }
-#portalModulesTable>li.portalModuleRow.active>a:focus {
+#portalModulesTable > li.portalModuleRow.active > a:focus {
   background-color: #fff !important;
 }
 .portal-dashboard {
@@ -5766,7 +5884,7 @@ TN-34230
 .portal-dashboard {
   border-bottom: 0px ! important;
 }
-#portal-shortcutsContainer>ul {
+#portal-shortcutsContainer > ul {
   border-bottom: 0px ! important;
 }
 .portalMenuHeader {
@@ -5775,14 +5893,15 @@ TN-34230
 }
 .cp-tabs .enabledModules {
   display: inline-block ! important;
-  margin-left: 4px !important;
-  margin-right: 4px !important;
+  margin-left: 4px!important;
+  margin-right: 4px!important;
   vertical-align: top;
   margin-top: 4px !important;
 }
 .portal-shortcut-list:hover {
   border-bottom: 3px solid transparent ! important;
 }
+/****** Customer Portal Settings ******/
 .label-radio label input[type="radio"] {
   position: relative;
   top: 2px;
@@ -5794,6 +5913,9 @@ TN-34230
 div.tooltip-inner {
   max-width: 400px;
 }
+/******************************************* 
+********** Menu Editor ********
+********************************************/
 .sortable.appContainer.ui-sortable {
   width: 160px;
 }
@@ -5968,7 +6090,7 @@ div.tooltip-inner {
   width: 13px !important;
   margin-top: 8px;
 }
-.detailview-table .input-group-addon+.inputElement.form-control,
+.detailview-table .input-group-addon + .inputElement.form-control,
 .detailview-table .inputElement.form-control.input-medium {
   width: 100%;
 }
@@ -6015,6 +6137,7 @@ div.tooltip-inner {
   float: left;
   margin-right: 5px;
 }
+/***** Oursites Changes *****/
 .portal-table .table-actions {
   width: inherit ! important;
 }
@@ -6026,6 +6149,7 @@ div.tooltip-inner {
   padding: 10px 5px ! important;
   padding-left: 10px ! important;
 }
+/***** Oursites Changes *****/
 .ExtensionscontentsDiv .content-area {
   padding-left: 15px;
   padding-right: 15px;
@@ -6039,14 +6163,14 @@ div.tooltip-inner {
 }
 .blockHeader {
   border-color: #F3F3F4 #F3F3F4 #cbcbcf;
-  border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
   background-color: #474747;
-  background-image: -moz-linear-gradient(top,#555555,#333333);
-  background-image: -ms-linear-gradient(top,#555555,#333333);
-  background-image: -webkit-gradient(linear,0 0,0 100%,from(#555555),to(#333333));
-  background-image: -webkit-linear-gradient(top,#555555,#333333);
-  background-image: -o-linear-gradient(top,#555555,#333333);
-  background-image: linear-gradient(top,#555555,#333333);
+  background-image: -moz-linear-gradient(top, #555555, #333333);
+  background-image: -ms-linear-gradient(top, #555555, #333333);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#333333));
+  background-image: -webkit-linear-gradient(top, #555555, #333333);
+  background-image: -o-linear-gradient(top, #555555, #333333);
+  background-image: linear-gradient(top, #555555, #333333);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#333333', GradientType=0);
   min-height: 30px;
@@ -6139,8 +6263,8 @@ div.tooltip-inner {
 .markStar .starredStatus {
   display: none;
 }
-.nav>li.addDashboardTab>a,
-.nav>li.addDashboardTab>a:hover {
+.nav > li.addDashboardTab > a,
+.nav > li.addDashboardTab > a:hover {
   padding: 10px 15px;
   background: inherit;
 }
@@ -6153,7 +6277,7 @@ div.tooltip-inner {
   height: 960px;
   width: 1260px;
 }
-.nav-tabs>li {
+.nav-tabs > li {
   border-bottom: 3px solid transparent;
   margin: 0 2px;
 }
@@ -6231,16 +6355,14 @@ div.tooltip-inner {
 }
 .select2-container.select2-container-multi.select2,
 .editViewPageDiv .select2-container.select2-container-multi.select2 {
-  height: auto !important;
+  height: auto!important;
 }
-.summaryViewFields .select2-container-multi.inputElement.form-control
-.quickCreateContent .select2-container.select2-container-multi.select2,
+.summaryViewFields .select2-container-multi.inputElement.form-control .quickCreateContent .select2-container.select2-container-multi.select2,
 #massEditContainer .select2-container.select2-container-multi.select2 {
   width: 150px;
   height: auto !important;
 }
-.summaryViewFields .select2-container-multi.inputElement.form-control
-.quickCreateContent .select2-container.select2-container-multi.select2 .input-save-wrap,
+.summaryViewFields .select2-container-multi.inputElement.form-control .quickCreateContent .select2-container.select2-container-multi.select2 .input-save-wrap,
 #massEditContainer .select2-container.select2-container-multi.select2 .input-save-wrap {
   float: right;
   margin-right: 25px;
@@ -6336,6 +6458,7 @@ a.cp-modules:hover {
 #RestrictionsLayout {
   background: #fafafb;
   margin-top: -92px;
+  /*to adjust with page padding top*/
 }
 #RestrictionsLayout .vtImage {
   width: 22%;
@@ -6369,6 +6492,7 @@ a.cp-modules:hover {
 .datepicker {
   z-index: 1100 !important;
 }
+/*****RSS Changes****/
 .feedListContainer .listview-table tr td:first-child,
 .listview-table tr th:first-child {
   width: inherit ! important;
@@ -6376,12 +6500,14 @@ a.cp-modules:hover {
 .feedListContainer .listViewEntries .listViewEntryValue {
   max-width: inherit ! important;
 }
-.ps-container>.ps-scrollbar-y-rail {
+/*****RSS Changes****/
+.ps-container > .ps-scrollbar-y-rail {
   z-index: 1002;
 }
 #relationBlock .recordScroll {
   max-height: 150px;
 }
+/*Start - List sidebar toggle*/
 .essentials-toggle {
   background-color: white;
   font-weight: bold;
@@ -6401,6 +6527,7 @@ a.cp-modules:hover {
 .essentials-toggle .fa-chevron-right {
   background-position: -460px -72px !important;
 }
+/*End - List essentials toggle*/
 .module-name-tooltip .qtip-content {
   font-size: 12px;
   padding: 3px;
@@ -6484,8 +6611,8 @@ li.select2-search-choice div {
 .popover ul.listmenu li {
   padding: 3px;
 }
-.popover-content .disabled>a,
-.popover .disabled>a {
+.popover-content .disabled > a,
+.popover .disabled > a {
   opacity: 0.5;
   cursor: not-allowed;
 }
@@ -6496,6 +6623,7 @@ li.select2-search-choice div {
   -o-transform: rotate(180deg);
   transform: rotate(180deg);
 }
+/*Start - List sidebar toggle*/
 .essentials-toggle {
   background-color: white;
   font-weight: bold;
@@ -6515,6 +6643,7 @@ li.select2-search-choice div {
 .essentials-toggle .fa-chevron-right {
   background-position: -460px -72px !important;
 }
+/*End - List essentials toggle*/
 .module-name-tooltip .qtip-content {
   font-size: 12px;
   padding: 3px;
@@ -6595,16 +6724,16 @@ li.select2-search-choice div {
 #reportDetails .pivot .toptitle.targetY0,
 #reportDetails .pivot .lefttitle.targetX0 {
   border-color: #F3F3F4 #F3F3F4 #cbcbcf;
-  border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
   background-color: #474747;
-  background-image: -moz-linear-gradient(top,#555555,#333333);
-  background-image: -ms-linear-gradient(top,#555555,#333333);
-  background-image: -webkit-gradient(linear,0 0,0 100%,from(#555555),to(#333333));
-  background-image: -webkit-linear-gradient(top,#555555,#333333);
-  background-image: -o-linear-gradient(top,#555555,#333333);
-  background-image: linear-gradient(top,#555555,#333333);
+  background-image: -moz-linear-gradient(top, #555555, #333333);
+  background-image: -ms-linear-gradient(top, #555555, #333333);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#333333));
+  background-image: -webkit-linear-gradient(top, #555555, #333333);
+  background-image: -o-linear-gradient(top, #555555, #333333);
+  background-image: linear-gradient(top, #555555, #333333);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555',endColorstr='#333333',GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#333333', GradientType=0);
   min-height: 30px;
 }
 #reportDetails .pivot th.toptitle.targetY0,
@@ -6646,7 +6775,8 @@ li.select2-search-choice div {
   background: #FFFFFF;
 }
 .templateActions {
-  background: rgba(0,0,0,0.1);
+  background: rgba(0, 0, 0, 0.1);
+  /*padding: 4%;*/
   bottom: 0;
   text-align: center;
   position: absolute;
@@ -6654,6 +6784,9 @@ li.select2-search-choice div {
   zoom: 1;
   width: 100%;
 }
+/*.templateActions i {
+    margin-right: 30px;
+}*/
 .thumbnails > li {
   float: left;
   height: 315px !important;
@@ -6828,9 +6961,10 @@ a.btnReport:hover {
   left: 0px;
 }
 .bx-wrapper .bx-viewport {
-  width:99%;
+  width: 99%;
   left: 0px;
   background: #fff;
+  /*fix other elements on the page moving (on Chrome)*/
   -webkit-transform: translatez(0);
   -moz-transform: translatez(0);
   -ms-transform: translatez(0);
@@ -6888,7 +7022,7 @@ a.btnReport:hover {
 .filter-search-show {
   display: block !important;
 }
-.emailTemplatesPopupTableContainer .listViewEntries  .listViewEntryValue {
+.emailTemplatesPopupTableContainer .listViewEntries .listViewEntryValue {
   max-width: 100%;
   min-width: 150px;
 }
@@ -6923,12 +7057,15 @@ input:focus::-webkit-input-placeholder {
 input:focus:-moz-placeholder {
   color: transparent;
 }
+/* FF 4-18 */
 input:focus::-moz-placeholder {
   color: transparent;
 }
+/* FF 19+ */
 input:focus:-ms-input-placeholder {
   color: transparent;
 }
+/* IE 10+ */
 .global-actions .dropdown-menu:before {
   position: absolute;
   top: -7px;
@@ -6937,7 +7074,7 @@ input:focus:-ms-input-placeholder {
   border-right: 7px solid transparent;
   border-bottom: 7px solid #ccc;
   border-left: 7px solid transparent;
-  border-bottom-color: rgba(0,0,0,0.2);
+  border-bottom-color: rgba(0, 0, 0, 0.2);
   content: '';
 }
 .global-actions .dropdown-menu:after {
@@ -7122,6 +7259,7 @@ input:focus:-ms-input-placeholder {
   text-align: center;
 }
 #OnBoardLayout #OnBoardPageContainer .crmGoals textarea::-webkit-input-placeholder {
+  /* WebKit browsers */
   text-align: center;
   padding: 20%;
   font-size: 12px;
@@ -7263,121 +7401,3 @@ input:focus:-ms-input-placeholder {
 .importServiceSelectionContainer .app-item {
   text-align: center;
 }
-.fieldValue .value a {
-  color: #15c !important;
-}
-.editViewContents .fieldLabel {
-  min-width: 100px;
-  width: 20%;
-  word-break: break-all;
-}
-.editViewContents .fieldValue {
-  width:30%;
-}
-.editViewContents td.fieldValue[colspan="3"] {
-  width:80%;
-}
-.editViewContents textarea.textAreaElement {
-  width: 88%;
-}
-.editViewContents input[type="checkbox"] {
-  width: 15px;
-  height: 15px;
-}
-.editViewContents input[type="radio"] {
-  width: 15px;
-  height: 15px;
-}
-#composeEmailContainer .modal-body .quickCreateContent,
-#QuickCreate .modal-body .quickCreateContent,
-#create .quickCreateContent {
-  margin-top: 25px;
-}
-.settingsgroup-panel .widgetContainer .menuItemLabel .pinUnpinShortCut {
-  display: none;
-  margin-top: 2px;
-}
-.settingsgroup-panel .widgetContainer .menuItemLabel:hover .pinUnpinShortCut {
-  display: inline-block;
-}
-@-moz-document url-prefix() {
-  .duplicateHandlingContainer .tooltip-inner {
-    width: 550px;
-    max-width: 550px;
-  }
-}
-.duplicateHandlingContainer .tooltip-inner {
-  text-align: left !important;
-}
-.duplicateHandlingContainer .syncMessage {
-  margin-top: 5px !important;
-}
-.duplicateHandlingContainer .actionsList {
-  width: 230px !important;
-}
-.duplicationMessageContainer {
-  background-color: #f2dede !important;
-  color: #b94a48 !important;
-}
-.duplicationMessageContainer .duplicationMessageHeader {
-  margin-bottom: 8px;
-}
-.listViewRecordActions .quickView, .listViewRecordActions .markStar,
-.listViewRecordActions .markAsHeld,.listViewRecordActions .holdFollowupOn {
-  margin-top: 4px;
-}
-.app-menu .module-icon .custom-module {
-	font-size: 14px;
-	border-radius: 4px;
-	color: #000;
-	background-color: #fff;
-	padding: 4px 10px 4px 5px !important
-}
-.menu-item .custom-module {
-	font-family: 'OpenSans-Regular', sans-serif;
-	font-size: 12px;
-	border-radius: 4px;
-	padding: 2px;
-	color: #000;
-	background-color: #fff;
-}
-.modules-menu .custom-module {
-	color: #fff;
-	margin-left: 0px;
-	display: inline;
-	border: 1px solid #fff;
-	border-radius: 4px;
-	padding: 3px 4px 3px 2px !important;
-	font-weight: bold;
-}
-#quickCreateModules .custom-module, .workflowListContainer .custom-module, .dashBoardTabContents .custom-module {
-	border-radius: 4px;
-	padding: 3px 5px;
-	color: #fff;
-	background-color: #777;
-}
-.menuEditorItem .custom-module {
-	border-radius: 4px;
-	padding: 3px 5px;
-	color: #000;
-	background-color: #fff;
-}
-.task-details .custom-module {
-	border-radius: 4px;
-	padding: 1px 4px;
-	color: white;
-	background-color: #777;
-}
-.related-tabs .custom-module, #relatedmenuList .custom-module {
-	border-radius: 4px;
-	color: #fff;
-	background-color: #777;
-	padding: 5px 7px;
-	font-weight: bold;
-}
-.record-header .custom-module {
-	font-size: 30px;
-}
-.moduleIcon .custom-module {
-	font-weight: bold;
-}
\ No newline at end of file
diff --git a/layouts/v7/skins/vtiger/style.less b/layouts/v7/skins/vtiger/style.less
index c1e6e9c0f6d86b4fcb043b7a782e108de9a95a47..712e913487ab469eb26aca471f04f1f259876dd1 100644
--- a/layouts/v7/skins/vtiger/style.less
+++ b/layouts/v7/skins/vtiger/style.less
@@ -880,6 +880,12 @@ a.menu-item:hover{
     pointer-events: none;
 }
 
+.input-group.percentage-input-group {
+    .form-control {
+        width: 100% !important;
+    }
+}
+
 //Horizontal scroll
 .bottomscroll-div,.topscroll-div {
     display: table;
@@ -1634,8 +1640,8 @@ ul.unstyled{
 }
 .listViewEntries .relatedListEntryValues .value{
     vertical-align: middle;
-        width: 80%;
-        display: inline-block;
+	width: 80%;
+	display: inline-block;
 }
 
 .floatThead-table{
@@ -1921,7 +1927,10 @@ input[type=checkbox]:checked{
 **********************************/
 
 .detailViewButtoncontainer{
-    padding-top:5px;   
+    padding-top:5px;
+}
+.detailViewButtoncontainer button.btn {
+	margin: 0px 1px !important;
 }
 .detailViewButtoncontainer button.btn {
   margin: 0px 1px !important;
@@ -2026,6 +2035,10 @@ strong, b, th{
 	margin: 0px 1px !important;
 }
 
+overlayDetailHeader button.btn {
+	margin: 0px 1px !important;
+}
+
 //detail view header edit end
 
 //detailview reference style removed
@@ -3200,7 +3213,7 @@ strong, b, th{
     color: @white;
 }
 .mailBoxEditDiv .crumbs li {
-  width: 22%;
+	width: 22%;
 }
 .stepNum{
     display: inline-block;
@@ -5282,6 +5295,9 @@ form[name="notification_settings"] .select2-choice {
 /******************************************* 
 ************* Dashboard Styles *************
 ********************************************/
+li.dashboardWidget {
+	overflow: hidden;
+}
 
 .dashboardWidgetHeader .title{
     padding-bottom: 10px;
@@ -5475,7 +5491,7 @@ form[name="notification_settings"] .select2-choice {
     border-radius: 1px;
 }
 .modal {
-    z-index:1100;
+	z-index:1100;
 }
 .select2-container .select2-choice {
     height:28px;
@@ -8357,10 +8373,10 @@ input:focus:-ms-input-placeholder { color:transparent; } /* IE 10+ */
 	display: inline-block;
 }
 @-moz-document url-prefix() {
-  .duplicateHandlingContainer .tooltip-inner {
-    width: 550px;
-    max-width: 550px;
-  }
+	.duplicateHandlingContainer .tooltip-inner {
+		width: 550px;
+		max-width: 550px;
+	}
 }
 .duplicateHandlingContainer{
 	.tooltip-inner {
@@ -8441,4 +8457,4 @@ input:focus:-ms-input-placeholder { color:transparent; } /* IE 10+ */
 }
 .moduleIcon .custom-module {
 	font-weight: bold;
-}
\ No newline at end of file
+}
diff --git a/libraries/freetag/freetag.class.php b/libraries/freetag/freetag.class.php
index 566c51ecc38ccb01666ab15cb74f8ab68fd361b6..7af7d61939a520463751c37f6d4db076f83428f2 100644
--- a/libraries/freetag/freetag.class.php
+++ b/libraries/freetag/freetag.class.php
@@ -976,7 +976,7 @@ class freetag {
 			ON ${prefix}freetagged_objects.module = vtiger_tab.name
 			WHERE vtiger_tab.presence != 1
 			$tagger_sql
-			GROUP BY tag
+			GROUP BY tag, tag_id
 			ORDER BY quantity DESC LIMIT 0, $max";
         //echo $sql;
 		$rs = $adb->pquery($sql, $params) or die("Syntax Error: $sql");
diff --git a/modules/Accounts/models/Module.php b/modules/Accounts/models/Module.php
index bced04aa49c9d53b095d8c479517d9c0ce4a8f06..853d5e5fca447bfd61dbd7970210ba346ba98ed1 100644
--- a/modules/Accounts/models/Module.php
+++ b/modules/Accounts/models/Module.php
@@ -110,6 +110,14 @@ class Accounts_Module_Model extends Vtiger_Module_Model {
 			$nonAdminQuery = $this->getNonAdminAccessControlQueryForRelation($relatedModuleName);
 			if ($nonAdminQuery) {
 				$query = appendFromClauseToQuery($query, $nonAdminQuery);
+
+				if(trim($nonAdminQuery)) {
+					$relModuleFocus = CRMEntity::getInstance($relatedModuleName);
+					$condition = $relModuleFocus->buildWhereClauseConditionForCalendar();
+					if($condition) {
+						$query .= ' AND '.$condition;
+					}
+				}
 			}
 
 			// There could be more than one contact for an activity.
@@ -162,6 +170,14 @@ class Accounts_Module_Model extends Vtiger_Module_Model {
 					AND (vtiger_activity.status is NULL OR vtiger_activity.status NOT IN ('Completed', 'Deferred', 'Cancelled'))
 					AND (vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus NOT IN ('Held', 'Cancelled'))";
 
+		if(!$currentUser->isAdminUser()) {
+			$moduleFocus = CRMEntity::getInstance('Calendar');
+			$condition = $moduleFocus->buildWhereClauseConditionForCalendar();
+			if($condition) {
+				$query .= ' AND '.$condition;
+			}
+		}
+
 		if ($mode === 'upcoming') {
 			$query .= " AND CASE WHEN vtiger_activity.activitytype='Task' THEN due_date >= '$currentDate' ELSE CONCAT(due_date,' ',time_end) >= '$nowInDBFormat' END";
 		} elseif ($mode === 'overdue') {
diff --git a/modules/Calendar/Activity.php b/modules/Calendar/Activity.php
index b384cfcd944984afdb3340b61ede59e4a60539d1..545cda9389e9853eaa715e8fb60857e3c6bc1d76 100644
--- a/modules/Calendar/Activity.php
+++ b/modules/Calendar/Activity.php
@@ -1052,21 +1052,22 @@ function insertIntoRecurringTable(& $recurObj)
 		$query = ' ';
 		$tabId = getTabid($module);
 		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2]
-				== 1 && $defaultOrgSharingPermission[$tabId] == 3) {
-			$tableName = 'vt_tmp_u'.$user->id.'_t'.$tabId;
-			$sharingRuleInfoVariable = $module.'_share_read_permission';
-			$sharingRuleInfo = $$sharingRuleInfoVariable;
+				== 1) {
 			$sharedTabId = null;
-			$this->setupTemporaryTable($tableName, $sharedTabId, $user,
-					$current_user_parent_role_seq, $current_user_groups);
-
-			$sharedUsers = $this->getListViewAccessibleUsers($user->id);
-			// we need to include group id's in $sharedUsers list to get the current user's group records
-			if($current_user_groups){
-				$sharedUsers = $sharedUsers.','. implode(',',$current_user_groups);
-			}
-			$query = " INNER JOIN $tableName $tableName$scope ON ($tableName$scope.id = ".
-					"vtiger_crmentity$scope.smownerid and $tableName$scope.shared=0 and $tableName$scope.id IN ($sharedUsers)) ";
+			//For Events
+			$tableName = 'vt_tmp_u'.$user->id.'_t'.$tabId.'_events';
+			$this->setupTemporaryTableForEvents($tableName, $sharedTabId, $user,
+				$current_user_parent_role_seq, $current_user_groups);
+			$query = " LEFT JOIN $tableName $tableName$scope ON ($tableName$scope.id = ".
+				"vtiger_crmentity$scope.smownerid AND vtiger_activity.activitytype NOT IN ('Emails', 'Task')) ";
+
+			//For Task
+			$task_tableName = 'vt_tmp_u'.$user->id.'_t'.$tabId.'_task';
+			$this->setupTemporaryTableForTask($task_tableName, $tabId, $user,
+				$current_user_parent_role_seq, $current_user_groups, $defaultOrgSharingPermission[$tabId]);
+
+			$query .= " LEFT JOIN $task_tableName $task_tableName$scope ON ($task_tableName$scope.id = ".
+				"vtiger_crmentity$scope.smownerid AND vtiger_activity.activitytype = 'Task') ";
 		}
 		return $query;
 	}
@@ -1087,7 +1088,7 @@ function insertIntoRecurringTable(& $recurObj)
 		return $query;
 	}
 
-	protected function setupTemporaryTable($tableName, $tabId, $user, $parentRole, $userGroups) {
+	protected function setupTemporaryTableForEvents($tableName, $tabId, $user, $parentRole, $userGroups) {
 		$module = null;
 		if (!empty($tabId)) {
 			$module = getTabname($tabId);
@@ -1113,6 +1114,26 @@ function insertIntoRecurringTable(& $recurObj)
 		return false;
 	}
 
+	protected function setupTemporaryTableForTask($tableName, $tabId, $user, $parentRole, $userGroups, $sharingPermission) {
+		$module = null;
+		if (!empty($tabId)) {
+			$module = getTabname($tabId);
+		}
+
+		if($sharingPermission == 3) {
+			$query = $this->getNonAdminAccessQuery($module, $user, $parentRole, $userGroups);
+		} else {
+			$query = " (SELECT $user->id as id) UNION (SELECT id FROM vtiger_users "
+				. "WHERE vtiger_users.deleted=0 AND vtiger_users.status='Active') "
+				. "UNION (SELECT groupid FROM vtiger_groups)";
+		}
+
+		$query = "CREATE TEMPORARY TABLE IF NOT EXISTS $tableName(id INT(11) PRIMARY KEY, shared ".
+			"int(1) DEFAULT 0) IGNORE ".$query;
+		$db = PearDatabase::getInstance();
+		$db->pquery($query, array());
+	}
+
 	protected function getListViewAccessibleUsers($sharedid) {
 		$db = PearDatabase::getInstance();;
 		$query = "SELECT vtiger_users.id as userid FROM vtiger_sharedcalendar
@@ -1131,5 +1152,19 @@ function insertIntoRecurringTable(& $recurObj)
 		$shared_ids = implode(",",$userid);
 		return $shared_ids;
 	}
+
+	public function buildWhereClauseConditionForCalendar($scope = '') {
+		$userModel = Users_Record_Model::getCurrentUserModel();
+		require('user_privileges/user_privileges_'.$userModel->id.'.php');
+
+		$query = "";
+		if($profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1) {
+			$tabId = getTabid("Calendar");
+			$eventTempTable = 'vt_tmp_u'.$userModel->id.'_t'.$tabId.'_events'.$scope;
+			$taskTempTable = 'vt_tmp_u'.$userModel->id.'_t'.$tabId.'_task'.$scope;
+			$query = " ($eventTempTable.shared IS NOT NULL OR $taskTempTable.shared IS NOT NULL) ";
+		}
+		return $query;
+	}
 }
 ?>
diff --git a/modules/Contacts/models/Module.php b/modules/Contacts/models/Module.php
index 7d492ec7a3f1b05683be0e548da7af898cf22dc2..5817ded3164010f20c21ff5a49633eff213f6fa0 100644
--- a/modules/Contacts/models/Module.php
+++ b/modules/Contacts/models/Module.php
@@ -65,6 +65,14 @@ class Contacts_Module_Model extends Vtiger_Module_Model {
 					AND (vtiger_activity.status is NULL OR vtiger_activity.status NOT IN ('Completed', 'Deferred'))
 					AND (vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus NOT IN ('Held'))";
 
+		if(!$currentUser->isAdminUser()) {
+			$moduleFocus = CRMEntity::getInstance('Calendar');
+			$condition = $moduleFocus->buildWhereClauseConditionForCalendar();
+			if($condition) {
+				$query .= ' AND '.$condition;
+			}
+		}
+
 		if ($recordId) {
 			$query .= " AND vtiger_cntactivityrel.contactid = ?";
 		} elseif ($mode === 'upcoming') {
@@ -251,6 +259,14 @@ class Contacts_Module_Model extends Vtiger_Module_Model {
 			$nonAdminQuery = $this->getNonAdminAccessControlQueryForRelation($relatedModuleName);
 			if ($nonAdminQuery) {
 				$query = appendFromClauseToQuery($query, $nonAdminQuery);
+
+				if(trim($nonAdminQuery)) {
+					$relModuleFocus = CRMEntity::getInstance($relatedModuleName);
+					$condition = $relModuleFocus->buildWhereClauseConditionForCalendar();
+					if($condition) {
+						$query .= ' AND '.$condition;
+					}
+				}
 			}
 		} else {
 			$query = parent::getRelationQuery($recordId, $functionName, $relatedModule, $relationId);
diff --git a/modules/CustomView/CustomView.php b/modules/CustomView/CustomView.php
index 85792a8b1fbdd4555982d13f50dc340105613e3c..db8bf8c97d353c0b67214672e6dd9f6172a8827a 100644
--- a/modules/CustomView/CustomView.php
+++ b/modules/CustomView/CustomView.php
@@ -13,6 +13,7 @@ require_once('include/utils/utils.php');
 require_once 'include/Webservices/Utils.php';
 
 global $adv_filter_options;
+global $mod_strings;
 
 $adv_filter_options = array("e" => "" . $mod_strings['equals'] . "",
 	"n" => "" . $mod_strings['not equal to'] . "",
@@ -2076,4 +2077,4 @@ class CustomView extends CRMEntity {
 
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/modules/Emails/views/MassSaveAjax.php b/modules/Emails/views/MassSaveAjax.php
index 9478dba2f9c68b198980042ca72910661d79244e..c3180faaf89bb43f164acf9447994604271efc69 100644
--- a/modules/Emails/views/MassSaveAjax.php
+++ b/modules/Emails/views/MassSaveAjax.php
@@ -155,8 +155,14 @@ class Emails_MassSaveAjax_View extends Vtiger_Footer_View {
 		$success = false;
 		$viewer = $this->getViewer($request);
 		if ($recordModel->checkUploadSize($documentIds)) {
+			// Fix content format acceptable to be preserved in table.
+			$decodedHtmlDescriptionToSend = $recordModel->get('description');
+			$recordModel->set('description', to_html($decodedHtmlDescriptionToSend));
 			$recordModel->save();
 
+			// Restore content to be dispatched through HTML mailer.
+			$recordModel->set('description', $decodedHtmlDescriptionToSend);
+
 			// To add entry in ModTracker for email relation
 			$emailRecordId = $recordModel->getId();
 			foreach ($toMailInfo as $recordId => $emailValueList) {
diff --git a/modules/HelpDesk/models/Module.php b/modules/HelpDesk/models/Module.php
index 5426fb6e1a2f4cab85667e42b0efc4c30a9bb510..7f82378012e17cef4242631fc027c3b3a5d1e8d5 100644
--- a/modules/HelpDesk/models/Module.php
+++ b/modules/HelpDesk/models/Module.php
@@ -164,6 +164,14 @@ class HelpDesk_Module_Model extends Vtiger_Module_Model {
 			$nonAdminQuery = $this->getNonAdminAccessControlQueryForRelation($relatedModuleName);
 			if ($nonAdminQuery) {
 				$query = appendFromClauseToQuery($query, $nonAdminQuery);
+
+				if(trim($nonAdminQuery)) {
+					$relModuleFocus = CRMEntity::getInstance($relatedModuleName);
+					$condition = $relModuleFocus->buildWhereClauseConditionForCalendar();
+					if($condition) {
+						$query .= ' AND '.$condition;
+					}
+				}
 			}
 		} else {
 			$query = parent::getRelationQuery($recordId, $functionName, $relatedModule, $relationId);
diff --git a/modules/Home/models/Module.php b/modules/Home/models/Module.php
index 2bea4aa117b1c703f219dbf3bc019341347d4c2e..f2fa1265ac9268443ec8b952aa0e7ff24c4a3225 100644
--- a/modules/Home/models/Module.php
+++ b/modules/Home/models/Module.php
@@ -198,6 +198,14 @@ class Home_Module_Model extends Vtiger_Module_Model {
 					AND (vtiger_activity.status is NULL OR vtiger_activity.status NOT IN ('Completed', 'Deferred', 'Cancelled'))
 					AND (vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus NOT IN ('Held', 'Cancelled'))";
 
+		if(!$currentUser->isAdminUser()) {
+			$moduleFocus = CRMEntity::getInstance('Calendar');
+			$condition = $moduleFocus->buildWhereClauseConditionForCalendar();
+			if($condition) {
+				$query .= ' AND '.$condition;
+			}
+		}
+
 		if ($mode === 'upcoming') {
 			$query .= " AND CASE WHEN vtiger_activity.activitytype='Task' THEN due_date >= '$currentDate' ELSE CONCAT(due_date,' ',time_end) >= '$nowInDBFormat' END";
 		} elseif ($mode === 'overdue') {
diff --git a/modules/Install/models/ConfigFileUtils.php b/modules/Install/models/ConfigFileUtils.php
index f92f183cb87ae967cd0836b6d52e6849efcc3fa1..b5b89fc41919dc70331407fb20d9ad06d8b75014 100644
--- a/modules/Install/models/ConfigFileUtils.php
+++ b/modules/Install/models/ConfigFileUtils.php
@@ -204,16 +204,9 @@ ini_set('memory_limit','64M');
 // files with one of these extensions will have '.txt' appended to their filename on upload
 \$upload_badext = array('php', 'php3', 'php4', 'php5', 'pl', 'cgi', 'py', 'asp', 'cfm', 'js', 'vbs', 'html', 'htm', 'exe', 'bin', 'bat', 'sh', 'dll', 'phps', 'phtml', 'xhtml', 'rb', 'msi', 'jsp', 'shtml', 'sth', 'shtm');
 
-// full path to include directory including the trailing slash
-// includeDirectory default value = \$root_directory..'include/
-\$includeDirectory = \$root_directory.'include/';
-
 // list_max_entries_per_page default value = 20
 \$list_max_entries_per_page = '20';
 
-// limitpage_navigation default value = 5
-\$limitpage_navigation = '5';
-
 // history_max_viewed default value = 5
 \$history_max_viewed = '5';
 
@@ -227,10 +220,6 @@ ini_set('memory_limit','64M');
 // default_theme default value = blue
 \$default_theme = 'softed';
 
-// show or hide time to compose each page
-// calculate_response_time default value = true
-\$calculate_response_time = true;
-
 // default text that is placed initially in the login form for user name
 // no default_user_name default value
 \$default_user_name = '';
@@ -243,13 +232,6 @@ ini_set('memory_limit','64M');
 // create_default_user default value = false
 \$create_default_user = false;
 
-// default_user_is_admin default value = false
-\$default_user_is_admin = false;
-
-// if your MySQL/PHP configuration does not support persistent connections set this to true to avoid a large performance slowdown
-// disable_persistent_connections default value = false
-\$disable_persistent_connections = false;
-
 //Master currency name
 \$currency_name = '{$this->currencyName}';
 
@@ -261,13 +243,6 @@ ini_set('memory_limit','64M');
 // default_language default value = en_us
 \$default_language = '{$this->vtDefaultLanguage}';
 
-// add the language pack name to every translation string in the display.
-// translation_string_prefix default value = false
-\$translation_string_prefix = false;
-
-//Option to cache tabs permissions for speed.
-\$cache_tab_perms = true;
-
 //Option to hide empty home blocks if no entries.
 \$display_empty_home_blocks = false;
 
diff --git a/modules/Install/models/Utils.php b/modules/Install/models/Utils.php
index f2696d16a4685504814baf4c57628319f028026b..f9c1995cc2fe2df50feea7657c2051004bf31b1d 100644
--- a/modules/Install/models/Utils.php
+++ b/modules/Install/models/Utils.php
@@ -414,6 +414,8 @@ class Install_Utils_Model {
 			$error_msg_info = getTranslatedString('MSG_DB_ROOT_USER_NOT_AUTHORIZED', 'Install');
 		} elseif(!$db_exist_status) {
 			$error_msg = $db_name.' -> '.getTranslatedString('ERR_DB_NOT_FOUND', 'Install');
+		} elseif(!$db_utf8_support) {
+			$error_msg = $db_name.' -> '.getTranslatedString('ERR_DB_NOT_UTF8', 'Install');
 		} else {
 			$dbCheckResult['flag'] = true;
 			return $dbCheckResult;
diff --git a/modules/Install/views/Index.php b/modules/Install/views/Index.php
index 30987167ef71a94473fc83300dd59c568b079c97..cc872c29f17e50cd1d9e4d9ee42adb1f9094b07a 100644
--- a/modules/Install/views/Index.php
+++ b/modules/Install/views/Index.php
@@ -27,7 +27,16 @@ class Install_Index_view extends Vtiger_View_Controller {
 		$this->exposeMethod('Step7');
 	}
 
+	protected function applyInstallFriendlyEnv() {
+		// config.inc.php - will not be ready to control this yet.
+		version_compare(PHP_VERSION, '5.5.0') <= 0 ? error_reporting(E_ERROR & ~E_NOTICE & ~E_DEPRECATED) : error_reporting(E_ERROR & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT);
+
+		set_time_limit(0); // override limits on execution time to allow install to finish
+	}
+
 	public function preProcess(Vtiger_Request $request, $display = true) {
+		$this->applyInstallFriendlyEnv();
+
 		date_default_timezone_set('Europe/London'); // to overcome the pre configuration settings
 		// Added to redirect to default module if already installed
 		$configFileName = 'config.inc.php';
@@ -171,9 +180,6 @@ class Install_Index_view extends Vtiger_View_Controller {
 	}
 
 	public function Step7(Vtiger_Request $request) {
-		// Set favourable error reporting
-		version_compare(PHP_VERSION, '5.5.0') <= 0 ? error_reporting(E_WARNING & ~E_NOTICE & ~E_DEPRECATED) : error_reporting(E_WARNING & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT);
-
 		$moduleName = $request->getModule();
 		$webuiInstance = new Vtiger_WebUI();
 		$isInstalled = $webuiInstance->isInstalled();
diff --git a/modules/Inventory/models/Module.php b/modules/Inventory/models/Module.php
index 991e5d59f7166ee4b0c47f2992bc281966464427..5e917570b28392359fca1fb0b89de7c303a22c49 100644
--- a/modules/Inventory/models/Module.php
+++ b/modules/Inventory/models/Module.php
@@ -84,6 +84,14 @@ class Inventory_Module_Model extends Vtiger_Module_Model {
 			$nonAdminQuery = $this->getNonAdminAccessControlQueryForRelation($relatedModuleName);
 			if ($nonAdminQuery) {
 				$query = appendFromClauseToQuery($query, $nonAdminQuery);
+
+				if(trim($nonAdminQuery)) {
+					$relModuleFocus = CRMEntity::getInstance($relatedModuleName);
+					$condition = $relModuleFocus->buildWhereClauseConditionForCalendar();
+					if($condition) {
+						$query .= ' AND '.$condition;
+					}
+				}
 			}
 		} else {
 			$query = parent::getRelationQuery($recordId, $functionName, $relatedModule, $relationId);
diff --git a/modules/Leads/models/Module.php b/modules/Leads/models/Module.php
index 94289dad9eea3bf471158dc622a9243502553528..2f3126412e0792089babc7304bcb6c1a28026ee7 100644
--- a/modules/Leads/models/Module.php
+++ b/modules/Leads/models/Module.php
@@ -297,6 +297,14 @@ class Leads_Module_Model extends Vtiger_Module_Model {
 			$nonAdminQuery = $this->getNonAdminAccessControlQueryForRelation($relatedModuleName);
 			if ($nonAdminQuery) {
 				$query = appendFromClauseToQuery($query, $nonAdminQuery);
+
+				if(trim($nonAdminQuery)) {
+					$relModuleFocus = CRMEntity::getInstance($relatedModuleName);
+					$condition = $relModuleFocus->buildWhereClauseConditionForCalendar();
+					if($condition) {
+						$query .= ' AND '.$condition;
+					}
+				}
 			}
 		} else {
 			$query = parent::getRelationQuery($recordId, $functionName, $relatedModule, $relationId);
diff --git a/modules/Migration/schema/540_to_600RC.php b/modules/Migration/schema/540_to_600RC.php
index 2701ca42af5d1e3ead0533a369f4d9c4c8701e1d..4b36dbc63711b1a86c20a58a2b94c919c4744d37 100644
--- a/modules/Migration/schema/540_to_600RC.php
+++ b/modules/Migration/schema/540_to_600RC.php
@@ -697,9 +697,10 @@ Migration_Index_View::ExecuteQuery('UPDATE vtiger_field SET presence = 1 WHERE t
 
 Migration_Index_View::ExecuteQuery('UPDATE vtiger_users SET truncate_trailing_zeros = ?', array(1));
 
-//deleted the id column from the All filter
+//deleted the id column from the All filter (exclude custom modules)
 Migration_Index_View::ExecuteQuery("DELETE FROM vtiger_cvcolumnlist WHERE cvid IN
-			(SELECT cvid FROM vtiger_customview WHERE viewname='All' AND entitytype NOT IN
+			(SELECT cvid FROM vtiger_customview INNER JOIN vtiger_tab ON vtiger_tab.name=vtiger_customview.entitytype
+				WHERE vtiger_tab.customized=0 AND viewname='All' AND entitytype NOT IN
 				('Emails','Calendar','ModComments','ProjectMilestone','Project','SMSNotifier','PBXManager','Webmails'))
 			AND columnindex = 0", array());
 
@@ -2501,4 +2502,4 @@ Migration_Index_View::ExecuteQuery("CREATE TABLE IF NOT EXISTS vtiger_faqcf (
                                 faqid int(19), 
                                 PRIMARY KEY (faqid), 
                                 CONSTRAINT fk_1_vtiger_faqcf FOREIGN KEY (faqid) REFERENCES vtiger_faq(id) ON DELETE CASCADE 
-                ) ENGINE=InnoDB DEFAULT CHARSET=utf8", array()); 
\ No newline at end of file
+                ) ENGINE=InnoDB DEFAULT CHARSET=utf8", array()); 
diff --git a/modules/Migration/views/Index.php b/modules/Migration/views/Index.php
index 8304d97f7ac49870eee1a4f6052509d13e645eb3..caecf7dba720fbd2bc1f23719ababfe80ae7d160 100644
--- a/modules/Migration/views/Index.php
+++ b/modules/Migration/views/Index.php
@@ -23,7 +23,9 @@ class Migration_Index_View extends Vtiger_View_Controller {
 
 	public function process(Vtiger_Request $request) {
 		// Override error reporting to production mode
-		version_compare(PHP_VERSION, '5.5.0') <= 0 ? error_reporting(E_WARNING & ~E_NOTICE & ~E_DEPRECATED) : error_reporting(E_WARNING & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT); 
+		version_compare(PHP_VERSION, '5.5.0') <= 0 ? error_reporting(E_WARNING & ~E_NOTICE & ~E_DEPRECATED) : error_reporting(E_WARNING & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT);
+		// Migration could be heavy at-times.
+		set_time_limit(0);	
 
 		$mode = $request->getMode();
 		if(!empty($mode)) {
diff --git a/modules/Potentials/models/Module.php b/modules/Potentials/models/Module.php
index 1e7782f48bcf9e9296754e9b8de20d877a5cf2f1..9ea4f242bc3a1335bf6d010698e5b00f5f148f77 100644
--- a/modules/Potentials/models/Module.php
+++ b/modules/Potentials/models/Module.php
@@ -278,6 +278,14 @@ class Potentials_Module_Model extends Vtiger_Module_Model {
 			$nonAdminQuery = $this->getNonAdminAccessControlQueryForRelation($relatedModuleName);
 			if ($nonAdminQuery) {
 				$query = appendFromClauseToQuery($query, $nonAdminQuery);
+
+				if(trim($nonAdminQuery)) {
+					$relModuleFocus = CRMEntity::getInstance($relatedModuleName);
+					$condition = $relModuleFocus->buildWhereClauseConditionForCalendar();
+					if($condition) {
+						$query .= ' AND '.$condition;
+					}
+				}
 			}
 		} else {
 			$query = parent::getRelationQuery($recordId, $functionName, $relatedModule, $relationId);
diff --git a/modules/PriceBooks/models/Relation.php b/modules/PriceBooks/models/Relation.php
index a265a1c5c97a4e764f41f4dfebe5b49d30cc2b2f..793b76b0f91848ddf2781e6f083d95c24420da08 100644
--- a/modules/PriceBooks/models/Relation.php
+++ b/modules/PriceBooks/models/Relation.php
@@ -48,6 +48,20 @@ class PriceBooks_Relation_Model extends Vtiger_Relation_Model{
 		if(!empty($selectColumnSql)) {
 			$query = $selectColumnSql.' FROM '.$newQuery[1];
 		}
+
+		if($relatedModuleName == 'Calendar') {
+			$nonAdminQuery = Users_Privileges_Model::getNonAdminAccessControlQuery($relatedModuleName);
+
+			if (trim($nonAdminQuery)) {
+				$query = appendFromClauseToQuery($query, $nonAdminQuery);
+
+				$moduleFocus = CRMEntity::getInstance('Calendar');
+				$condition = $moduleFocus->buildWhereClauseConditionForCalendar();
+				if($condition) {
+					$query .= ' AND '.$condition;
+				}
+			}
+		}
 		return $query;
 	}
 
diff --git a/modules/PriceBooks/views/Popup.php b/modules/PriceBooks/views/Popup.php
index 83c037961b07993808b5e50bf71aaa03a1513552..3beef1487d8c6433cd892cbe5b3f43d0a42b1bb3 100644
--- a/modules/PriceBooks/views/Popup.php
+++ b/modules/PriceBooks/views/Popup.php
@@ -63,6 +63,9 @@ class PriceBooks_Popup_View extends Vtiger_Popup_View {
 			$listViewModel->set('src_field', $sourceField);
 			$listViewModel->set('src_record', $sourceRecord);
 		}
+		if (!empty($sourceRecord)) {
+			$listViewModel->set('src_record', $sourceRecord);
+		}
 		if((!empty($searchKey)) && (!empty($searchValue))) {
 			$listViewModel->set('search_key', $searchKey);
 			$listViewModel->set('search_value', $searchValue);
@@ -164,4 +167,4 @@ class PriceBooks_Popup_View extends Vtiger_Popup_View {
 		$viewer->assign('MULTI_SELECT', $multiSelectMode);
 		$viewer->assign('CURRENT_USER_MODEL', Users_Record_Model::getCurrentUserModel());
 	}
-}
\ No newline at end of file
+}
diff --git a/modules/Products/models/RelationListView.php b/modules/Products/models/RelationListView.php
index 19e7d665f6b3d16d0fbfbf2e32002d87bfe7a3a8..b9c320d1e48be73e0f5dfee03a4dd645ee24627c 100644
--- a/modules/Products/models/RelationListView.php
+++ b/modules/Products/models/RelationListView.php
@@ -70,6 +70,21 @@ class Products_RelationListView_Model extends Vtiger_RelationListView_Model {
 			}
 		}
 
+		$nonAdminQuery = Users_Privileges_Model::getNonAdminAccessControlQuery($relatedModuleName);
+		if (trim($nonAdminQuery)) {
+			if($relatedModuleName == 'Calendar') {
+				$query = appendFromClauseToQuery($query, $nonAdminQuery);
+
+				$moduleFocus = CRMEntity::getInstance('Calendar');
+				$condition = $moduleFocus->buildWhereClauseConditionForCalendar();
+				if($condition) {
+					$query .= ' AND '.$condition;
+				}
+			} else {
+				$query = appendFromClauseToQuery($query, $nonAdminQuery);
+			}
+		}
+
 		return $query;
 	}
 
diff --git a/modules/Reports/ReportRun.php b/modules/Reports/ReportRun.php
index 5f9c6564c65c638ab52873f22aa3a1943a34120e..44af415b788c0419356598a835a10cb78307ec20 100644
--- a/modules/Reports/ReportRun.php
+++ b/modules/Reports/ReportRun.php
@@ -2828,6 +2828,25 @@ class ReportRun extends CRMEntity {
 		}
 		$log->info("ReportRun :: Successfully returned getReportsQuery" . $module);
 
+
+		$secondarymodule = explode(":", $this->secondarymodule);
+		if(in_array('Calendar', $secondarymodule) || $module == 'Calendar') {
+			$currentUserModel = Users_Record_Model::getCurrentUserModel();
+			$tabId = getTabid('Calendar');
+			$task_tableName = 'vt_tmp_u'.$currentUserModel->id.'_t'.$tabId.'_task';
+			$event_tableName = 'vt_tmp_u'.$currentUserModel->id.'_t'.$tabId.'_events';
+			if(!$currentUserModel->isAdminUser()
+				&& stripos($query, $event_tableName) && stripos($query, $task_tableName)) {
+				$moduleFocus = CRMEntity::getInstance('Calendar');
+				$scope = '';
+				if(in_array('Calendar', $secondarymodule)) $scope = 'Calendar';
+				$condition = $moduleFocus->buildWhereClauseConditionForCalendar($scope);
+				if($condition) {
+					$query .= ' AND '.$condition;
+				}
+			}
+		}
+
 		return $query;
 	}
 
diff --git a/modules/Settings/MenuEditor/models/Module.php b/modules/Settings/MenuEditor/models/Module.php
index 6c24ab6e06a325d86f109c45330bf5a4ba2b0bd5..b31221dc5ee232bddda44a448f45eb31b46dd645 100644
--- a/modules/Settings/MenuEditor/models/Module.php
+++ b/modules/Settings/MenuEditor/models/Module.php
@@ -84,6 +84,8 @@ class Settings_MenuEditor_Module_Model extends Settings_Vtiger_Module_Model {
 	}
 
 	public static function addModuleToApp($moduleName, $parent) {
+		if (empty($moduleName) || empty($parent)) return;
+
 		$db = PearDatabase::getInstance();
 		$parent = strtoupper($parent);
 		$oldToNewAppMapping = Vtiger_MenuStructure_Model::getOldToNewAppMapping();
diff --git a/modules/Settings/Vtiger/actions/OutgoingServerSaveAjax.php b/modules/Settings/Vtiger/actions/OutgoingServerSaveAjax.php
index 78a3f648c01aa045d63c92a7d598f6d2057177d1..52d47351165183f047101d61c8818792d7ca9200 100644
--- a/modules/Settings/Vtiger/actions/OutgoingServerSaveAjax.php
+++ b/modules/Settings/Vtiger/actions/OutgoingServerSaveAjax.php
@@ -21,9 +21,13 @@ class Settings_Vtiger_OutgoingServerSaveAjax_Action extends Settings_Vtiger_Basi
         }
         $response = new Vtiger_Response();
         try{
-            $id = $outgoingServerSettingsModel->save($request);
-            $data = $outgoingServerSettingsModel->getData();
-            $response->setResult($data);
+            if ($loadDefaultSettings == "true") {
+                $response->setResult('OK');
+            } else {
+                $id = $outgoingServerSettingsModel->save($request);
+                $data = $outgoingServerSettingsModel->getData();
+                $response->setResult($data);
+            }
         }catch(Exception $e) {
             $response->setError($e->getCode(), $e->getMessage());
         }
@@ -33,4 +37,4 @@ class Settings_Vtiger_OutgoingServerSaveAjax_Action extends Settings_Vtiger_Basi
     public function validateRequest(Vtiger_Request $request) {
         $request->validateWriteAccess();
     }
-}
\ No newline at end of file
+}
diff --git a/modules/Settings/Vtiger/models/Module.php b/modules/Settings/Vtiger/models/Module.php
index 6fd25b49e2110beb24bc9e4c23ee1fc8a1e481ef..f6a276f33e631c21d2f55d6bdbfcc8ac706d7fa5 100644
--- a/modules/Settings/Vtiger/models/Module.php
+++ b/modules/Settings/Vtiger/models/Module.php
@@ -186,6 +186,19 @@ class Settings_Vtiger_Module_Model extends Vtiger_Base_Model {
 		return $blocksList[$viewName];
 	}
 
+	public function getModuleIcon() {
+		$moduleName = $this->getName();
+		$moduleModel = Vtiger_Module_Model::getInstance($moduleName);
+		if ($moduleModel) {
+			$moduleIcon = $moduleModel->getModuleIcon();
+		} else {
+			$lowerModuleName = strtolower($moduleName);
+			$title = vtranslate($moduleName, $moduleName);
+			$moduleIcon = "<i class='vicon-$lowerModuleName' title='$title'></i>";
+		}
+		return $moduleIcon;
+	}
+
 	static function getSettingsMenuListForNonAdmin() {
 		$currentUser = Users_Record_Model::getCurrentUserModel();
 		$myTagSettingsUrl = $currentUser->getMyTagSettingsListUrl();
@@ -201,19 +214,4 @@ class Settings_Vtiger_Module_Model extends Vtiger_Base_Model {
 
 		return $settingsMenuList;
 	}
-
-	public function getModuleIcon() {
-		$moduleName = $this->getName();
-		$moduleModel = Vtiger_Module_Model::getInstance($moduleName);
-		if ($moduleModel) {
-			$moduleIcon = $moduleModel->getModuleIcon();
-		} else {
-			$lowerModuleName = strtolower($moduleName);
-			$title = vtranslate($moduleName, $moduleName);
-			$moduleIcon = "<i class='vicon-$lowerModuleName' title='$title'></i>";
-		}
-
-		return $moduleIcon;
-	}	
-
 }
diff --git a/modules/Settings/Vtiger/models/OutgoingServer.php b/modules/Settings/Vtiger/models/OutgoingServer.php
index b3ca8032f23cee99e2c701ade03197b18646898e..be48433fa969c6eaa966d385ff04b3a7cbd7c2a3 100644
--- a/modules/Settings/Vtiger/models/OutgoingServer.php
+++ b/modules/Settings/Vtiger/models/OutgoingServer.php
@@ -24,11 +24,17 @@ class Settings_Vtiger_OutgoingServer_Model extends Settings_Vtiger_Systems_Model
                 <br><br>Thanks  and  Regards,<br> Team vTiger <br><br>';
     }
     
-    public function loadDefaultValues() {
+	public function loadDefaultValues() {
         $defaultOutgoingServerDetails = VtigerConfig::getOD('DEFAULT_OUTGOING_SERVER_DETAILS');
+        if (empty($defaultOutgoingServerDetails)) {
+            $db = PearDatabase::getInstance();
+            $db->pquery('DELETE FROM vtiger_systems WHERE server_type = ?', array('email'));
+            return;
+        }
         foreach ($defaultOutgoingServerDetails as $key=>$value){
             $this->set($key,$value);
         }
+
         $this->defaultLoaded = true;
     }
 	
@@ -76,4 +82,4 @@ class Settings_Vtiger_OutgoingServer_Model extends Settings_Vtiger_Systems_Model
         } 
         return parent::save();
     }
-}
\ No newline at end of file
+}
diff --git a/modules/Users/Users.php b/modules/Users/Users.php
index 40edb728e2c46f27075f0065e8d3a1320955bcfb..06d225806d638badc528cc37be9a897fd958c683 100755
--- a/modules/Users/Users.php
+++ b/modules/Users/Users.php
@@ -703,7 +703,7 @@ class Users extends CRMEntity {
 	 * @param $module -- module name:: Type varchar
 	 *
 	 */
-	function saveentity($module) {
+	function saveentity($module, $fileid='') {
 		global $current_user;//$adb added by raju for mass mailing
 		$insertion_mode = $this->mode;
 		if(empty($this->column_fields['time_zone'])) {
@@ -793,7 +793,7 @@ class Users extends CRMEntity {
 	 * @param $table_name -- table name:: Type varchar
 	 * @param $module -- module:: Type varchar
 	 */
-	function insertIntoEntityTable($table_name, $module) {
+	function insertIntoEntityTable($table_name, $module, $fileid='') {
 		global $log;
 		$log->info("function insertIntoEntityTable ".$module.' vtiger_table name ' .$table_name);
 		global $adb, $current_user;
@@ -993,7 +993,7 @@ class Users extends CRMEntity {
 	 * @param $record -- record id:: Type integer
 	 * @param $module -- module:: Type varchar
 	 */
-	function retrieve_entity_info($record, $module) {
+	function retrieve_entity_info($record, $module, $allowDeleted = false) {
 		global $adb,$log;
 		$log->debug("Entering into retrieve_entity_info($record, $module) method.");
 
@@ -1075,7 +1075,7 @@ class Users extends CRMEntity {
 	 * @param $module -- module name:: Type varchar
 	 * @param $file_details -- file details array:: Type array
 	 */
-	function uploadAndSaveFile($id,$module,$file_details) {
+	function uploadAndSaveFile($id,$module,$file_details,$attachmentType='Attachment') {
 		global $log;
 		$log->debug("Entering into uploadAndSaveFile($id,$module,$file_details) method.");
 
@@ -1147,10 +1147,10 @@ class Users extends CRMEntity {
 	 * @param $module -- module name:: Type varchar
 	 *
 	 */
-	function save($module_name) {
+	function save($module_name, $fileid='') {
 		global $log, $adb;
 
-		parent::save($module_name);
+		parent::save($module_name, $fileid);
 
 		// Added for Reminder Popup support
 		$query_prev_interval = $adb->pquery("SELECT reminder_interval from vtiger_users where id=?",
@@ -1408,7 +1408,7 @@ class Users extends CRMEntity {
 	 * @param $input_value -- Input value for the column taken from the User
 	 * @return Column value of the field.
 	 */
-	function get_column_value($columname, $fldvalue, $fieldname, $uitype, $datatype) {
+	function get_column_value($columname, $fldvalue, $fieldname, $uitype, $datatype='') {
 		if (is_uitype($uitype, "_date_") && $fldvalue == '') {
 			return null;
 		}
@@ -2101,4 +2101,4 @@ class Users_CRMSetup {
 		return $packagesList;
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/modules/Vtiger/helpers/Util.php b/modules/Vtiger/helpers/Util.php
index 610aaa76f08515eade8c4f7045207064095abdc2..3ea6edf4f9c00b3b2c5d76985dd6774d859d5582 100644
--- a/modules/Vtiger/helpers/Util.php
+++ b/modules/Vtiger/helpers/Util.php
@@ -756,6 +756,19 @@ class Vtiger_Util_Helper {
 		return (stristr($db_character_set, 'utf8') && stristr($db_collation_type, 'utf8'));
 	}
 
+	public static function checkDbLocalInfileSupport() {
+		$db = PearDatabase::getInstance();
+		$rs = $db->pquery("show variables like 'local_infile'", array());
+		$db_local_infile = null;
+		while ($arr = $db->fetch_array($rs)) {
+			switch($arr['variable_name']) {
+				case 'local_infile': $db_local_infile = $arr['value']; break;
+			}
+			if ($db_local_infile != null) break;
+		}
+		return ($db_local_infile == '1' || strtolower($db_local_infile) == 'on');
+	}
+
 	/**
 	 * Function to get both date string and date difference string
 	 * @param <Date Time> $dateTime
diff --git a/modules/Vtiger/models/Module.php b/modules/Vtiger/models/Module.php
index f1ffd66ce63cc8cd9ee46e8cba7f8e23d4f62f30..cdd415e8e6516716d63d93dc9592aff231e853da 100644
--- a/modules/Vtiger/models/Module.php
+++ b/modules/Vtiger/models/Module.php
@@ -593,17 +593,18 @@ class Vtiger_Module_Model extends Vtiger_Module {
 	 * @return <Array> returns related fields list.
 	 */
 	public function getRelatedListFields() {
-		$entityInstance = CRMEntity::getInstance($this->getName());
-		$list_fields_name = $entityInstance->list_fields_name;
-		$list_fields = $entityInstance->list_fields;
 		$relatedListFields = array();
-		foreach ($list_fields as $key => $fieldInfo) {
-			foreach ($fieldInfo as $columnName) {
-				if(array_key_exists($key, $list_fields_name)){
-					$relatedListFields[$columnName] = $list_fields_name[$key];
+		$entityInstance = CRMEntity::getInstance($this->getName());
+		if (isset($entityInstance->list_fields_name)) {
+			$list_fields_name = $entityInstance->list_fields_name;
+			$list_fields = $entityInstance->list_fields;
+			foreach ($list_fields as $key => $fieldInfo) {
+				foreach ($fieldInfo as $columnName) {
+					if(array_key_exists($key, $list_fields_name)){
+						$relatedListFields[$columnName] = $list_fields_name[$key];
+					}
 				}
 			}
-
 		}
 		return $relatedListFields;
 	}
@@ -1089,6 +1090,14 @@ class Vtiger_Module_Model extends Vtiger_Module {
 					AND (vtiger_activity.status is NULL OR vtiger_activity.status NOT IN ('Completed', 'Deferred', 'Cancelled'))
 					AND (vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus NOT IN ('Held','Cancelled'))";
 
+		if(!$currentUser->isAdminUser()) {
+			$moduleFocus = CRMEntity::getInstance('Calendar');
+			$condition = $moduleFocus->buildWhereClauseConditionForCalendar();
+			if($condition) {
+				$query .= ' AND '.$condition;
+			}
+		}
+
 		$params = array($this->getName());
 
 		if ($recordId) {
@@ -1521,6 +1530,14 @@ class Vtiger_Module_Model extends Vtiger_Module {
 
 		if ($nonAdminQuery) {
 			$query = appendFromClauseToQuery($query, $nonAdminQuery);
+
+			if($functionName == 'get_activities' && trim($nonAdminQuery)) {
+				$moduleFocus = CRMEntity::getInstance('Calendar');
+				$condition = $moduleFocus->buildWhereClauseConditionForCalendar();
+				if($condition) {
+					$query .= ' AND '.$condition;
+				}
+			}
 		}
 
 		return $query;
diff --git a/modules/Vtiger/uitypes/Email.php b/modules/Vtiger/uitypes/Email.php
index 1eae884cf77aea456b61642a809718d011ba553b..3cf39170bf63e2e5347213a48f078dd1c83e5467 100644
--- a/modules/Vtiger/uitypes/Email.php
+++ b/modules/Vtiger/uitypes/Email.php
@@ -31,19 +31,19 @@ class Vtiger_Email_UIType extends Vtiger_Base_UIType {
                  */
                 if($moduleName == "Users" && $fieldName == "user_name"){
                     $value = "<a class='cursorPointer' onclick=\"Vtiger_Helper_Js.getInternalMailer($recordId," .
-                    		"'$fieldName','$moduleName');\">" . textlength_check($value) . "</a>";
+                    		"'$fieldName','$moduleName');\">" . ($value) . "</a>";
                 }else{
                 	$value = "<a class='emailField cursorPointer' onclick=\"Vtiger_Helper_Js.getInternalMailer($recordId," .
-                    		"'$fieldName','$moduleName');\">" . textlength_check($value) . "</a>";
+                    		"'$fieldName','$moduleName');\">" . ($value) . "</a>";
                 }
 			} else {
                 if($moduleName == "Users" && $fieldName == "user_name"){
-                    $value = "<a class='cursorPointer'  href='mailto:" . $value . "'>" . textlength_check($value) . "</a>";
+                    $value = "<a class='cursorPointer'  href='mailto:" . $value . "'>" . ($value) . "</a>";
                 }else{
-                    $value = "<a class='emailField cursorPointer'  href='mailto:" . $value . "'>" . textlength_check($value) . "</a>";
+                    $value = "<a class='emailField cursorPointer'  href='mailto:" . $value . "'>" . ($value) . "</a>";
                 }
 			}
 		}
 		return $value;
 	}
-}
\ No newline at end of file
+}
diff --git a/modules/Vtiger/views/Basic.php b/modules/Vtiger/views/Basic.php
index 0f38dc8c09f86951f1be15adcee791c1bfb661d2..fcaacdfa669d328e3a62f10a2e5e0447d10412fd 100644
--- a/modules/Vtiger/views/Basic.php
+++ b/modules/Vtiger/views/Basic.php
@@ -53,7 +53,7 @@ abstract class Vtiger_Basic_View extends Vtiger_Footer_View {
 		$menuGroupedByParent['SUPPORT'] = $supportGroup;
 
 		foreach ($menuGroupedByParent as $parentCategory => $menuList) {
-			if($parentCategory == 'ANALYTICS') continue;
+			if($parentCategory == 'ANALYTICS' || $parentCategory == 'SETTINGS') continue;
 			if(count($menuList) > 0) {
 				if(array_key_exists($selectedModule, $menuList) && $parentCategory) {
 					$moduleFound = true;
@@ -181,4 +181,4 @@ abstract class Vtiger_Basic_View extends Vtiger_Footer_View {
 			$request->validateReadAccess();
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/modules/Vtiger/views/Import.php b/modules/Vtiger/views/Import.php
index 20c634ac152391dfc982901265edc0a80afe3f00..c30168cc4f20a7e69ce090d5d1cf84374878930c 100644
--- a/modules/Vtiger/views/Import.php
+++ b/modules/Vtiger/views/Import.php
@@ -129,6 +129,12 @@ class Vtiger_Import_View extends Vtiger_Index_View {
 		}
 		//End
 
+		// Pre-conditional check for CSV import.
+		if ($fileFormat == 'csv') {
+			$isLocalInfileEnabled = Vtiger_Util_Helper::checkDbLocalInfileSupport();
+			if (!$isLocalInfileEnabled) throw new Exception(vtranslate('ERR_LOCAL_INFILE_NOT_ON', 'Import'));
+		}
+
 		$viewer->assign('AVAILABLE_FIELDS', $moduleMeta->getMergableFields());
 		$viewer->assign('ENTITY_FIELDS', $moduleMeta->getEntityFields());
 		$viewer->assign('ERROR_MESSAGE', $request->get('error_message'));
diff --git a/modules/Vtiger/views/MassActionAjax.php b/modules/Vtiger/views/MassActionAjax.php
index 252d60d2235e0890afd54fe8072a11fff7ca2eb0..8bc719064a9649716ada80316115c9139e52682f 100644
--- a/modules/Vtiger/views/MassActionAjax.php
+++ b/modules/Vtiger/views/MassActionAjax.php
@@ -68,6 +68,7 @@ class Vtiger_MassActionAjax_View extends Vtiger_IndexAjax_View {
 		$viewer->assign('CVID', $cvId);
 		$viewer->assign('SELECTED_IDS', $selectedIds);
 		$viewer->assign('EXCLUDED_IDS', $excludedIds);
+		$viewer->assign('VIEW_SOURCE','MASSEDIT');
 		$viewer->assign('RECORD_STRUCTURE_MODEL', $recordStructureInstance);
 		$viewer->assign('MODULE_MODEL',$moduleModel); 
 		$viewer->assign('MASS_EDIT_FIELD_DETAILS',$fieldInfo); 
@@ -298,6 +299,22 @@ class Vtiger_MassActionAjax_View extends Vtiger_IndexAjax_View {
 
 		$sourceModule = $request->getModule();
 		$moduleName = 'SMSNotifier';
+
+		$isCreateAllowed = Users_Privileges_Model::isPermitted($moduleName, 'CreateView');
+		if(!$isCreateAllowed) {
+			throw new AppException(vtranslate('LBL_PERMISSION_DENIED'));
+		}
+		
+		$viewer = $this->getViewer($request);
+
+		require_once 'modules/SMSNotifier/SMSNotifier.php';
+		if (!SMSNotifier::checkServer()) {
+			$viewer->assign('TITLE', vtranslate('LBL_SEND_SMS', $moduleName));
+			$viewer->assign('BODY', vtranslate('LBL_NOT_ACCESSIBLE', $moduleName));
+			echo $viewer->view('NotAccessible.tpl', $moduleName, true);
+			exit;
+		}
+
 		$selectedIds = $this->getRecordsListFromRequest($request);
 		$excludedIds = $request->get('excluded_ids');
 		$cvId = $request->get('viewname');
@@ -305,7 +322,6 @@ class Vtiger_MassActionAjax_View extends Vtiger_IndexAjax_View {
 		$user = Users_Record_Model::getCurrentUserModel();
         $moduleModel = Vtiger_Module_Model::getInstance($sourceModule);
         $phoneFields = $moduleModel->getFieldsByType('phone');
-		$viewer = $this->getViewer($request);
 		
 		if(count($selectedIds) == 1){
 			$recordId = $selectedIds[0];
diff --git a/modules/Vtiger/views/RelatedList.php b/modules/Vtiger/views/RelatedList.php
index 7b2d92a816cdda9511ef30275c818ef43d4f0c06..bd0811a8d0e6fafcd4015bcfbedb787f9901bf32 100644
--- a/modules/Vtiger/views/RelatedList.php
+++ b/modules/Vtiger/views/RelatedList.php
@@ -81,8 +81,6 @@ class Vtiger_RelatedList_View extends Vtiger_Index_View {
 		$relatedModuleModel = $relationModel->getRelationModuleModel();
 		$relationField = $relationModel->getRelationField();
         
-        
-        $moduleFields = $relatedModuleModel->getFields();
         $fieldsInfo = array();
         foreach($moduleFields as $fieldName => $fieldModel){
             $fieldsInfo[$fieldName] = $fieldModel->getFieldInfo();
@@ -135,4 +133,4 @@ class Vtiger_RelatedList_View extends Vtiger_Index_View {
 		$viewer->assign('TAB_LABEL', $request->get('tab_label'));
         return $viewer->view('RelatedList.tpl', $moduleName, 'true');
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/vtiger/mandatory/Import.zip b/packages/vtiger/mandatory/Import.zip
index 9381fab3a9345cca1abe58f3857d38bf92537440..3b7f24eb6cb1bd71fc39fc3ea2cc53ecb8d11d9e 100644
Binary files a/packages/vtiger/mandatory/Import.zip and b/packages/vtiger/mandatory/Import.zip differ
diff --git a/packages/vtiger/mandatory/Mobile.zip b/packages/vtiger/mandatory/Mobile.zip
index 5ddc719b7a8a6942b923289ddfd1f81610d3baeb..a9f0af45a4a79024b1a3510a74d56f79a2081116 100644
Binary files a/packages/vtiger/mandatory/Mobile.zip and b/packages/vtiger/mandatory/Mobile.zip differ
diff --git a/packages/vtiger/mandatory/ModTracker.zip b/packages/vtiger/mandatory/ModTracker.zip
index 698f8b95d577a5dda0a2b367e089084d5a595fa2..17d56d445ff13f2e258e3ba63868fb1745ce3448 100644
Binary files a/packages/vtiger/mandatory/ModTracker.zip and b/packages/vtiger/mandatory/ModTracker.zip differ
diff --git a/packages/vtiger/mandatory/PBXManager.zip b/packages/vtiger/mandatory/PBXManager.zip
index 5fb02c9151b93cf87cbf11461911d31d8ed61dc1..7be5911126fa0265294cfa908d4d8af6178a2e4b 100644
Binary files a/packages/vtiger/mandatory/PBXManager.zip and b/packages/vtiger/mandatory/PBXManager.zip differ
diff --git a/packages/vtiger/mandatory/ServiceContracts.zip b/packages/vtiger/mandatory/ServiceContracts.zip
index 6e3418be3d22688f4b7e34716fc0a7c9f1b56993..e4aaacb4aa52ea83f80bf65e477f3943a6fcb09c 100644
Binary files a/packages/vtiger/mandatory/ServiceContracts.zip and b/packages/vtiger/mandatory/ServiceContracts.zip differ
diff --git a/packages/vtiger/mandatory/Services.zip b/packages/vtiger/mandatory/Services.zip
index 993690aeb1748a4c33b00e11b33d0ae741d33cd8..795ddef843dad29e773a520f84b58bbaf8176f02 100644
Binary files a/packages/vtiger/mandatory/Services.zip and b/packages/vtiger/mandatory/Services.zip differ
diff --git a/packages/vtiger/mandatory/WSAPP.zip b/packages/vtiger/mandatory/WSAPP.zip
index 7b7a0df6b5bccb107e971c1ed44f902a5f42fe1b..7cfa6fdeea5e95f6a69e42058d52d98543d42bee 100644
Binary files a/packages/vtiger/mandatory/WSAPP.zip and b/packages/vtiger/mandatory/WSAPP.zip differ
diff --git a/packages/vtiger/marketplace/ExtensionStore.zip b/packages/vtiger/marketplace/ExtensionStore.zip
index 3df242b806b9283c07f74f29bc77e5af19f455dc..9fca87095725498f5e1cfaabfa8a5c25c5334d41 100644
Binary files a/packages/vtiger/marketplace/ExtensionStore.zip and b/packages/vtiger/marketplace/ExtensionStore.zip differ
diff --git a/packages/vtiger/optional/Arabic_ar_ae.zip b/packages/vtiger/optional/Arabic_ar_ae.zip
index 61f5369aa6d6832c13080780329575fd093486e9..587e241cf23006cd575ac304a56d2d5ced60a86e 100644
Binary files a/packages/vtiger/optional/Arabic_ar_ae.zip and b/packages/vtiger/optional/Arabic_ar_ae.zip differ
diff --git a/packages/vtiger/optional/Assets.zip b/packages/vtiger/optional/Assets.zip
index fa1ecc5377feb52423e62320dc2775f70c13d47b..008171c47bb9d2bdfec73dad66c736d927f0b59f 100644
Binary files a/packages/vtiger/optional/Assets.zip and b/packages/vtiger/optional/Assets.zip differ
diff --git a/packages/vtiger/optional/BrazilianLanguagePack_bz_bz.zip b/packages/vtiger/optional/BrazilianLanguagePack_bz_bz.zip
index abc773de310a858a850ae2ac24b2b4b284afad49..adad7c9d83947ee6089153d3525b790ca9b999f7 100644
Binary files a/packages/vtiger/optional/BrazilianLanguagePack_bz_bz.zip and b/packages/vtiger/optional/BrazilianLanguagePack_bz_bz.zip differ
diff --git a/packages/vtiger/optional/BritishLanguagePack_br_br.zip b/packages/vtiger/optional/BritishLanguagePack_br_br.zip
index dc3de17c58572008cf0493bd12b50c0cdab4dfcd..9045cafb9507a2fc318524a9503f642c56f3c220 100644
Binary files a/packages/vtiger/optional/BritishLanguagePack_br_br.zip and b/packages/vtiger/optional/BritishLanguagePack_br_br.zip differ
diff --git a/packages/vtiger/optional/CustomerPortal.zip b/packages/vtiger/optional/CustomerPortal.zip
index 7fc52788c026f98a3b8d8d8e1b5f586934a7e307..b46c133ef25b6284cbacde5ef738ba883e000bb7 100644
Binary files a/packages/vtiger/optional/CustomerPortal.zip and b/packages/vtiger/optional/CustomerPortal.zip differ
diff --git a/packages/vtiger/optional/Deutsch.zip b/packages/vtiger/optional/Deutsch.zip
index 6d0b3aca847b0fa279605f80f662ef1b821ffb5a..19d8604980da73edaeb07ebf83b8e4c13da327e7 100644
Binary files a/packages/vtiger/optional/Deutsch.zip and b/packages/vtiger/optional/Deutsch.zip differ
diff --git a/packages/vtiger/optional/Dutch.zip b/packages/vtiger/optional/Dutch.zip
index 214e0166b6d904583375c0d6e6cac0563bbc78db..df28fd867b3f5d71f86facca05c8f356595a5b67 100644
Binary files a/packages/vtiger/optional/Dutch.zip and b/packages/vtiger/optional/Dutch.zip differ
diff --git a/packages/vtiger/optional/French.zip b/packages/vtiger/optional/French.zip
index 995fedf544081b628055342e46174e3624628b6e..e5edabd61e2d913dba801d65a697249d3248a1b7 100644
Binary files a/packages/vtiger/optional/French.zip and b/packages/vtiger/optional/French.zip differ
diff --git a/packages/vtiger/optional/Google.zip b/packages/vtiger/optional/Google.zip
index 04c41cd6d013a83f1b4b4b4ca071799cec2ebc4c..e3a3ad16189790e3badb91756f556a28b5f54a83 100644
Binary files a/packages/vtiger/optional/Google.zip and b/packages/vtiger/optional/Google.zip differ
diff --git a/packages/vtiger/optional/Hungarian.zip b/packages/vtiger/optional/Hungarian.zip
index 6f7c52d67a88b33e18ee5d75c96d3b1405ae02fa..842405c8973fc744859be2abf69ca92f0f151715 100644
Binary files a/packages/vtiger/optional/Hungarian.zip and b/packages/vtiger/optional/Hungarian.zip differ
diff --git a/packages/vtiger/optional/ItalianLanguagePack_it_it.zip b/packages/vtiger/optional/ItalianLanguagePack_it_it.zip
index 2a6265fdb698a427a785791469c763edb758eb3c..2a6d5f73715d33369086dac8772c674c5d9b86cb 100644
Binary files a/packages/vtiger/optional/ItalianLanguagePack_it_it.zip and b/packages/vtiger/optional/ItalianLanguagePack_it_it.zip differ
diff --git a/packages/vtiger/optional/MexicanSpanishLanguagePack_es_mx.zip b/packages/vtiger/optional/MexicanSpanishLanguagePack_es_mx.zip
index 51a0bbbc8e6ef97feb05a9e20581ea5199f84b28..88df38253ef14161bef62bd14ddf0595dd72ac00 100644
Binary files a/packages/vtiger/optional/MexicanSpanishLanguagePack_es_mx.zip and b/packages/vtiger/optional/MexicanSpanishLanguagePack_es_mx.zip differ
diff --git a/packages/vtiger/optional/PolishLanguagePack_pl_pl.zip b/packages/vtiger/optional/PolishLanguagePack_pl_pl.zip
index 0de6543bdc1275f1a94163b319707e1a8838780c..1c4502bbdfce827d89a9272cb144a265bde38401 100644
Binary files a/packages/vtiger/optional/PolishLanguagePack_pl_pl.zip and b/packages/vtiger/optional/PolishLanguagePack_pl_pl.zip differ
diff --git a/packages/vtiger/optional/Projects.zip b/packages/vtiger/optional/Projects.zip
index e0c8e167c443c71b5c6b67a6135f477aa3ce3a8f..b414d3988a3387d41581301506114dcc3486f55a 100644
Binary files a/packages/vtiger/optional/Projects.zip and b/packages/vtiger/optional/Projects.zip differ
diff --git a/packages/vtiger/optional/RomanianLanguagePack_rm_rm.zip b/packages/vtiger/optional/RomanianLanguagePack_rm_rm.zip
index 9ce40af7560a0bca5fa6610810bd1933cf127a08..09159238d0ca8686290d23a169e79d2651f84698 100644
Binary files a/packages/vtiger/optional/RomanianLanguagePack_rm_rm.zip and b/packages/vtiger/optional/RomanianLanguagePack_rm_rm.zip differ
diff --git a/packages/vtiger/optional/Russian.zip b/packages/vtiger/optional/Russian.zip
index 2729a41bd359cc427fab8d81bb3a9ad286446ba8..8590178c1919534d83f37b3243060e78b9652267 100644
Binary files a/packages/vtiger/optional/Russian.zip and b/packages/vtiger/optional/Russian.zip differ
diff --git a/packages/vtiger/optional/SMSNotifier.zip b/packages/vtiger/optional/SMSNotifier.zip
index 0ebb7091704fffc557f564760004cdefcc78b704..f898e4f82fa52e31e237e0dfcf322d710f76ccb7 100644
Binary files a/packages/vtiger/optional/SMSNotifier.zip and b/packages/vtiger/optional/SMSNotifier.zip differ
diff --git a/packages/vtiger/optional/Spanish.zip b/packages/vtiger/optional/Spanish.zip
index 0291a2058a71339f5e043e791e8f5a7ef85aff75..5b0c8e9f80180323dbbaefb65ea9691c911a37d0 100644
Binary files a/packages/vtiger/optional/Spanish.zip and b/packages/vtiger/optional/Spanish.zip differ
diff --git a/packages/vtiger/optional/Sweden_sv_se.zip b/packages/vtiger/optional/Sweden_sv_se.zip
index d17b4df6b27e0685ee8c4616ebbff9b5992673a0..af9cee8997f4c688cd1ba635866f20d951238dea 100644
Binary files a/packages/vtiger/optional/Sweden_sv_se.zip and b/packages/vtiger/optional/Sweden_sv_se.zip differ
diff --git a/packages/vtiger/optional/TurkishLanguagePack_tr_tr.zip b/packages/vtiger/optional/TurkishLanguagePack_tr_tr.zip
index d13da498e39cb27bdb5e79a3b7363780ff769d64..5def5083ee1814af41a417abba98b6253e6a2fdc 100644
Binary files a/packages/vtiger/optional/TurkishLanguagePack_tr_tr.zip and b/packages/vtiger/optional/TurkishLanguagePack_tr_tr.zip differ
diff --git a/packages/vtiger/optional/Webforms.zip b/packages/vtiger/optional/Webforms.zip
index 7b146205a7908f7a2b943982e33c7ee1c9368b90..f5af7db95f4f7eae1a5fb31d59c7015d449a2fd7 100644
Binary files a/packages/vtiger/optional/Webforms.zip and b/packages/vtiger/optional/Webforms.zip differ
diff --git a/pkg/vtiger/modules/ConfigEditor/manifest.xml b/pkg/vtiger/modules/ConfigEditor/manifest.xml
deleted file mode 100644
index ab6542430033e5fb5855385274f994b0045c791e..0000000000000000000000000000000000000000
--- a/pkg/vtiger/modules/ConfigEditor/manifest.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0'?>
-<module>
-	<exporttime>2010-12-23 13:46:05</exporttime>
-	<name>ConfigEditor</name>
-	<label>ConfigEditor</label>
-	<parent></parent>
-	<type>extension</type>
-	<version>1.9</version>
-	<dependencies>
-		<vtiger_version>5.1.0</vtiger_version>
-		<vtiger_max_version>7.*</vtiger_max_version>
-	</dependencies>
-	<tables>
-	</tables>
-</module>
diff --git a/pkg/vtiger/modules/ConfigEditor/modules/ConfigEditor/ConfigEditor.js b/pkg/vtiger/modules/ConfigEditor/modules/ConfigEditor/ConfigEditor.js
deleted file mode 100644
index 4b4c74fdcad9e6327937b2b1ab967cf5877a8d33..0000000000000000000000000000000000000000
--- a/pkg/vtiger/modules/ConfigEditor/modules/ConfigEditor/ConfigEditor.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-function replaceUploadSize(){
-	var upload = document.getElementById('key_upload_maxsize').value;
-	upload = "'"+upload+"'";
-	upload = upload.replace(/000000/g,"");
-	upload = upload.replace(/'/g,"");
-	document.getElementById('key_upload_maxsize').value = upload;
-}
-
-
-function vtlib_field_help_show_this(basenode, fldname) {
-	var domnode = $('vtlib_fieldhelp_div');
-
-	
-
-	var helpcontent = document.getElementById('helpInfo').value;
-
-
-	if(!domnode) {
-		domnode = document.createElement('div');
-		domnode.id = 'vtlib_fieldhelp_div';
-		domnode.className = 'dvtSelectedCell';
-		domnode.style.position = 'absolute';
-		domnode.style.width = '150px';
-		domnode.style.padding = '4px';
-		domnode.style.fontWeight = 'normal';
-		document.body.appendChild(domnode);
-
-		domnode = $('vtlib_fieldhelp_div');
-		Event.observe(domnode, 'mouseover', function() { $('vtlib_fieldhelp_div').show(); });
-		Event.observe(domnode, 'mouseout', vtlib_field_help_hide);
-	}
-	else {
-		domnode.show();
-	}
-	domnode.innerHTML = helpcontent;
-	fnvshobj(basenode,'vtlib_fieldhelp_div');
-}
diff --git a/pkg/vtiger/modules/ConfigEditor/modules/ConfigEditor/ConfigEditor.php b/pkg/vtiger/modules/ConfigEditor/modules/ConfigEditor/ConfigEditor.php
deleted file mode 100644
index 1d238894544f4a95790317a25dba2dc7fe25e7d8..0000000000000000000000000000000000000000
--- a/pkg/vtiger/modules/ConfigEditor/modules/ConfigEditor/ConfigEditor.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-
-class ConfigEditor {
-	
-	/**
-	 * Invoked when special actions are performed on the module.
-	 * @param String Module name
-	 * @param String Event Type (module.postinstall, module.disabled, module.enabled, module.preuninstall)
-	 */
-	function vtlib_handler($modulename, $event_type) {
-		
-		$registerLink = false; 
-		
-		if($event_type == 'module.postinstall') {
-			$registerLink = true;
-		} else if($event_type == 'module.disabled') {
-			// TODO Handle actions when this module is disabled.
-			$registerLink = false;
-		} else if($event_type == 'module.enabled') {
-			// TODO Handle actions when this module is enabled
-			$registerLink = true;
-		} else if($event_type == 'module.preuninstall') {
-			return;
-		} else if($event_type == 'module.preupdate') {
-			return;
-		} else if($event_type == 'module.postupdate') {
-			return;
-		}
-		
-		$displayLabel = 'LBL_CONFIG_EDITOR';
-		
-		global $adb;
-		if ($registerLink) {
-			$blockid = $adb->query_result( 
-				$adb->pquery("SELECT blockid FROM vtiger_settings_blocks WHERE label='LBL_OTHER_SETTINGS'",array()),
-				0, 'blockid');
-			$sequence = (int)$adb->query_result(
-				$adb->pquery("SELECT max(sequence) as sequence FROM vtiger_settings_field WHERE blockid=?",array($blockid)),
-				0, 'sequence') + 1;
-			$fieldid = $adb->getUniqueId('vtiger_settings_field');
-			$adb->pquery("INSERT INTO vtiger_settings_field (fieldid,blockid,sequence,name,iconpath,description,linkto)
-				VALUES (?,?,?,?,?,?,?)", array($fieldid, $blockid,$sequence,$displayLabel,'migrate.gif','Update configuration file of the application', 'index.php?module=ConfigEditor&action=index'));
-		} else {
-			$adb->pquery("DELETE FROM vtiger_settings_field WHERE name=?", array($displayLabel));
-		}
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/pkg/vtiger/modules/ConfigEditor/modules/ConfigEditor/ConfigEditorAjax.php b/pkg/vtiger/modules/ConfigEditor/modules/ConfigEditor/ConfigEditorAjax.php
deleted file mode 100644
index efae0a94a8a793af8918ea218e122792dfb7c603..0000000000000000000000000000000000000000
--- a/pkg/vtiger/modules/ConfigEditor/modules/ConfigEditor/ConfigEditorAjax.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-require_once('include/Ajax/CommonAjax.php');
-?>
diff --git a/pkg/vtiger/modules/ConfigEditor/modules/ConfigEditor/ConfigEditorHandler.php b/pkg/vtiger/modules/ConfigEditor/modules/ConfigEditor/ConfigEditorHandler.php
deleted file mode 100644
index 74ef1c29708f4b72338659c53434b176cdf652d2..0000000000000000000000000000000000000000
--- a/pkg/vtiger/modules/ConfigEditor/modules/ConfigEditor/ConfigEditorHandler.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-class ConfigEditorHandler extends VTEventHandler {
-
-	function handleEvent($eventName, $data) {
-
-		if($eventName == 'vtiger.entity.beforesave') {
-			// Entity is about to be saved, take required action
-		}
-
-		if($eventName == 'vtiger.entity.aftersave') {
-			// Entity has been saved, take next action
-		}
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/pkg/vtiger/modules/ConfigEditor/modules/ConfigEditor/ConfigFileReader.php b/pkg/vtiger/modules/ConfigEditor/modules/ConfigEditor/ConfigFileReader.php
deleted file mode 100644
index 1daf6f5316c8548279dd8b6aa5c8023b8fd993d3..0000000000000000000000000000000000000000
--- a/pkg/vtiger/modules/ConfigEditor/modules/ConfigEditor/ConfigFileReader.php
+++ /dev/null
@@ -1,305 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-
-/**
- * Configuration file reader
- */
-class ConfigFileReader {
-	// Each line is treated as configuration row
-	protected $rows;
-	// Path to configuration file
-	protected $filepath;
-	
-	// Iteration support for rows
-	protected $rowIndex;
-	
-	// Editables and Viewables
-	protected $viewables;
-	protected $editables;
-	
-	/**
-	 * Constructor
-	 * You can restrict variable display for viewing and editing
-	 */
-	function __construct($path, $viewables=array(), $editables=array()) {
-		$this->filepath = $path;
-		$this->viewables = $viewables;
-		$this->editables = $editables;
-		$this->read();
-	}
-	
-	/**
-	 * Read and parse the configuration file contents.
-	 */
-	protected function read() {
-		$fileContent = trim(file_get_contents($this->filepath));
-		$pattern = '/\$([^=]+)=([^;]+);/';
-		$matches = null;
-		$matchesFound = preg_match_all($pattern, $fileContent, $matches);
-		$configContents = array();
-		if($matchesFound) {
-			$configContents = $matches[0];
-		}
-		$this->rows = array();
-		foreach($configContents as $configLine) {
-			$this->rows[] = new ConfigFileRow($configLine, $this);
-		}
-		$this->rowIndex = -1;
-		unset($fileContent);
-	}
-	
-	/**
-	 * Save the rows back to configuration.
-	 */
-	function save() {
-		$fileContent = trim(file_get_contents($this->filepath));
-		if ($this->rows) {
-			$fp = fopen($this->filepath, 'w');
-			$rowcount = count($this->rows);
-			for($index = 0; $index < $rowcount; ++$index) {
-				$row = $this->rows[$index];
-				if($row->isEditable()) {
-					$variableName = $row->variableName();
-					$newVariableValue = $row->variableValue();
-					$pattern = '/\$'.$variableName.'[\s]+=([^;]+);/';
-					$replacement = $row->toString();
-					$fileContent = preg_replace($pattern, $replacement, $fileContent);
-				}
-			}
-			fwrite($fp, $fileContent);
-			fclose($fp);
-		}
-	}
-	
-	function editables($key = false) {
-		if ($key === false) return array_keys($this->editables);
-		return $this->editables[$key];
-	}
-	
-	function viewables($key = false) {
-		if ($key === false) return array_keys($this->viewables);
-		return $this->viewables[$key];
-	}
-	
-	/**
-	 * Set new value to the desired variable.
-	 */
-	function setVariableValue($name, $value) {
-		if ($this->rows) {
-			foreach($this->rows as $row) {
-				if ($row->matchesVariableName($name)) {
-					if($name == 'upload_maxsize'){
-						return $row->setVariableValue($value*1000000);
-					}else{
-						return $row->setVariableValue($value);
-					}
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Get all the rows
-	 */
-	function getAll() {
-		return $this->rows;
-	}
-	
-	/**
-	 * Has next row to read?
-	 */
-	function next() {
-		if ($this->rowIndex++ < count($this->rows)) {
-			return true;
-		}
-	}
-	
-	/**
-	 * Get the current row during iteration (please call next() before this)
-	 */
-	function get() {
-		return $this->rows[$this->rowIndex];
-	}
-	
-	/**
-	 * Rewind the iteration
-	 */
-	function rewind() {
-		$this->rowIndex = 0;
-	}
-}
-
-/**
- * Configuration file row class
- */
-class ConfigFileRow {
-	// Actual line content
-	protected $lineContent;
-	// Parsed variable name and value
-	protected $parsedVarName = false;
-	protected $parsedVarValue= '';
-	
-	// Is the variable of string type?
-	protected $isValueString = false;
-	
-	// Some variables which is never editable
-	protected static $alltimeNoneditableVars = array(
-		"dbconfig['db_server']",
-		"application_unique_key"
-	);
-	
-	// Editable and Viewable variable names
-	protected $parent;
-	
-	// Is the variable value editable?
-	protected $isValueEditable = false;
-	
-	// Regex to detect variable name and its safe value
-	static $variableRegex = '/^[ \t]*\\$([^=]+)=([^;]+)/';
-	//Regex to detect support name,it doesnt allow any single quote,and special characters,it does allow only alpha numeric,utf8,.com,@
-	static $variableUnSafeValueRegex = "/[\x{4e00}-\x{9fa5}[:print:]]+.*\-/u";
-	/**
-	 * Constructor
-	 */
-	function __construct($content, $parent) {
-		$this->lineContent = $content;
-		$this->parent = $parent;
-		$this->parse();
-	}
-	
-	/**
-	 * Parse the content
-	 */
-	protected function parse() {
-		if (preg_match(self::$variableRegex, $this->lineContent, $m)) {
-			$this->parsedVarName = trim($m[1]);
-			$this->parsedVarValue = trim($m[2]);
-			// Is variable string type?
-			if (strpos($this->parsedVarValue, "'") === 0 || strpos($this->parsedVarValue, '"') === 0) {
-				$this->isValueString = true;
-				$this->parsedVarValue = trim($m[2], "'\" ");
-			}
-			if (!in_array($this->parsedVarName, self::$alltimeNoneditableVars)) {
-				$this->isValueEditable = true;
-			} else {
-				$this->isValueEditable = false;
-			}
-		}
-	}
-	
-	/**
-	 * Does the row represent variable?
-	 */
-	function isVariable() {
-		return ($this->parsedVarName !== false);
-	}
-	
-	/**
-	 * Is the variable viewable?
-	 */
-	function isViewable() {
-		if ($this->isVariable()) {
-			$editables = $this->parent->editables();
-			if (!empty($editables)) {
-				return in_array($this->parsedVarName, $this->parent->viewables());
-			} else {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	/** 
-	 * Is the variable editable?
-	 */
-	function isEditable() {
-		if ($this->isVariable()) {
-			$editables = $this->parent->editables();
-			if (empty($editables)) {
-				return $this->isValueEditable;
-			}
-			return ((in_array($this->parsedVarName, $editables) !== false) && $this->isValueEditable);
-		}
-		return false;
-	}
-	
-	/**
-	 * Get variable name
-	 */
-	function variableName() {
-		return $this->parsedVarName;
-	}
-	
-	/**
-	 * Check if the variable name matches with input
-	 */
-	function matchesVariableName($input) {
-		$input = ltrim($input, '$');
-		return ($input == $this->parsedVarName);
-	}
-	
-	/**
-	 * Get variable value
-	 */
-	function variableValue() {
-		return $this->parsedVarValue;
-	}
-	
-	/**
-	 * Is the variable value string type?
-	 */
-	function isValueString() {
-		return $this->isValueString;
-	}
-	
-	/**
-	 * Set the variable value
-	 */
-	function setVariableValue($value) {
-		// TODO Avoid any PHP String concate hacks
-		if (preg_match(self::$variableUnSafeValueRegex, $value, $m)) {
-			return false;
-		}
-		// Should the value be restricted to a set?
-		$meta = $this->meta();
-		if (isset($meta['values']) && is_array($meta['values']) ) {
-			$allowedValues = array_keys($meta['values']);
-			if (!empty($allowedValues) && !in_array($value, $allowedValues)) {
-				return false;
-			}
-		}
-		$this->parsedVarValue = $value;
-		return true;
-	}
-	
-	/**
-	 * Get the meta information
-	 */
-	function meta() {
-		if ($this->isEditable()) return $this->parent->editables($this->parsedVarName);
-		if ($this->isViewable()) return $this->parent->viewables($this->parsedVarName);
-		return false;
-	}
-	
-	/**
-	 * String representation of the instance
-	 */
-	function toString() {
-		if ($this->isVariable()) {
-			$encloseWith = "";
-			if ($this->isValueString()) {
-				$encloseWith = "'";
-			}
-			return sprintf("\$%s = %s%s%s;", $this->parsedVarName, $encloseWith, $this->parsedVarValue, $encloseWith);
-		}
-		return $this->lineContent;
-	}
-}
-?>
\ No newline at end of file
diff --git a/pkg/vtiger/modules/ConfigEditor/modules/ConfigEditor/ConfigurationUtils.php b/pkg/vtiger/modules/ConfigEditor/modules/ConfigEditor/ConfigurationUtils.php
deleted file mode 100644
index dabbc1674b70e4a8432df88f6d90c93c90b325b0..0000000000000000000000000000000000000000
--- a/pkg/vtiger/modules/ConfigEditor/modules/ConfigEditor/ConfigurationUtils.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/* 
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-require_once 'include/utils/utils.php';
-class ConfigurationUtils{
-	static function getEntityModule() {
-		global $adb;
-		$unusedmodules = array('Events','Emails');
-		$additionalModules = array('Home');
-		$query = "SELECT name FROM vtiger_tab WHERE isentitytype = 1";
-		$res = $adb->pquery($query, array());
-		$rows = $adb->num_rows($res);
-		for($i=0; $i <$rows; $i++) {
-			$module[] = $adb->query_result($res, $i, 'name');
-		}
-		$modules = array_merge($module,$additionalModules);
-		$modules = array_diff($modules,$unusedmodules);
-		return $modules;
-	}
-}
-?>
diff --git a/pkg/vtiger/modules/ConfigEditor/modules/ConfigEditor/Request.php b/pkg/vtiger/modules/ConfigEditor/modules/ConfigEditor/Request.php
deleted file mode 100644
index 3c520c66be5425e049f5086f78cc4b5e85ea4ba3..0000000000000000000000000000000000000000
--- a/pkg/vtiger/modules/ConfigEditor/modules/ConfigEditor/Request.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-class ConfigEditor_Request {
-	protected $valuemap;
-	
-	function __construct($values) {
-		$this->valuemap = $values;
-	}
-	
-	function get($key, $defvalue='') {
-		$value = $defvalue;
-		if (isset($this->valuemap[$key])) {
-			$value = $this->valuemap[$key];
-		}
-		if (!empty($value)) {
-			$value = vtlib_purify($value);
-		}
-		return $value;
-	}
-	
-	function values() {
-		return $this->valuemap;
-	}
-}
-?>
\ No newline at end of file
diff --git a/pkg/vtiger/modules/ConfigEditor/modules/ConfigEditor/Viewer.php b/pkg/vtiger/modules/ConfigEditor/modules/ConfigEditor/Viewer.php
deleted file mode 100644
index 7a5521d21575c64248e840e6b71cfbe8a8fcc4dd..0000000000000000000000000000000000000000
--- a/pkg/vtiger/modules/ConfigEditor/modules/ConfigEditor/Viewer.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-require_once('Smarty_setup.php');
-
-class ConfigEditor_Viewer extends vtigerCRM_Smarty {
-	function ConfigEditor_Viewer() {
-		parent::vtigerCRM_Smarty();
-		
-		global $app_strings, $mod_strings, $currentModule, $theme;
-		
-		$this->assign('CUSTOM_MODULE', true);
-
-		$this->assign('APP', $app_strings);
-		$this->assign('MOD', $mod_strings);
-		$this->assign('MODULE', $currentModule);
-		// TODO: Update Single Module Instance name here.
-		$this->assign('SINGLE_MOD', 'SINGLE_'.$currentModule); 
-		$this->assign('CATEGORY', 'Settings');
-		$this->assign('IMAGE_PATH', "themes/$theme/images/");
-		$this->assign('THEME', $theme);
-	}
-}
-?>
\ No newline at end of file
diff --git a/pkg/vtiger/modules/ConfigEditor/modules/ConfigEditor/config.php b/pkg/vtiger/modules/ConfigEditor/modules/ConfigEditor/config.php
deleted file mode 100644
index f99df210569261c826ec702f439b7fb0f82f5906..0000000000000000000000000000000000000000
--- a/pkg/vtiger/modules/ConfigEditor/modules/ConfigEditor/config.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-include('ConfigurationUtils.php');
-$modules = ConfigurationUtils::getEntityModule();
-$moduleLabels = array();
-foreach($modules as $module) {
-	$moduleLabels[$module] = getTranslatedString($module, $module);
-}
-
-$trueFalseArray = array(
-	'true' => getTranslatedString('LBL_TRUE','ConfigEditor'),
-	'false' => getTranslatedString('LBL_FALSE','ConfigEditor')
-);
-
-$__ConfigEditor_Config = array(
-	
-	'edit.filepath' => dirname(__FILE__) . '/../../config.inc.php',
-
-	/* CONFIGURE:
-	 * List the configuration variables that user can set.
-	 * By setting it to array() lets allows editing of all variables but it is not RECOMMENDED
-	 */
-	'allow.editing.variables' => array(
-		'CALENDAR_DISPLAY' => array('label'=>getTranslatedString('LBL_MINI_CALENDAR_DISPLAY','ConfigEditor'),'values'=>$trueFalseArray),
-		'WORLD_CLOCK_DISPLAY' => array('label'=> getTranslatedString('LBL_WORLD_CLOCK_DISPLAY','ConfigEditor'),'values'=>$trueFalseArray),
-		'CALCULATOR_DISPLAY' => array('label' => getTranslatedString('LBL_CALCULATOR_DISPLAY','ConfigEditor') , 'values'=>$trueFalseArray),
-		'USE_RTE' => array('label'=>getTranslatedString('LBL_USE_RTE','ConfigEditor'), 'values'=>$trueFalseArray),
-		'HELPDESK_SUPPORT_EMAIL_ID'=>array('label'=>getTranslatedString('LBL_HELPDESK_SUPPORT_EMAILID','ConfigEditor'),'values'=>array()),
-		'HELPDESK_SUPPORT_NAME' => array('label' => getTranslatedString('LBL_HELPDESK_SUPPORT_NAME','ConfigEditor'),'values'=>array()),
-		'upload_maxsize' => array('label'=>getTranslatedString('LBL_MAX_UPLOAD_SIZE','ConfigEditor'),'values'=>array()),
-		'history_max_viewed' => array('label'=>getTranslatedString('LBL_MAX_HISTORY_VIEWED','ConfigEditor'),'values'=>array()),
-		'default_module' => array('label'=>getTranslatedString('LBL_DEFAULT_MODULE','ConfigEditor'),'values'=>$moduleLabels),
-		'listview_max_textlength' => array('label' => getTranslatedString('LBL_MAX_TEXT_LENGTH_IN_LISTVIEW','ConfigEditor'), 'values' => array() ),
-		'list_max_entries_per_page' => array('label' => getTranslatedString('LBL_MAX_ENTRIES_PER_PAGE_IN_LISTVIEW','ConfigEditor'), 'values'=> array()),
-	)
-	
-);
-?>
\ No newline at end of file
diff --git a/pkg/vtiger/modules/ConfigEditor/modules/ConfigEditor/index.php b/pkg/vtiger/modules/ConfigEditor/modules/ConfigEditor/index.php
deleted file mode 100644
index 161e6384fd88e8e430c0cc1520b127c39853e45e..0000000000000000000000000000000000000000
--- a/pkg/vtiger/modules/ConfigEditor/modules/ConfigEditor/index.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-include_once dirname(__FILE__) . '/Request.php';
-include_once dirname(__FILE__) . '/Viewer.php';
-include_once dirname(__FILE__) . '/ConfigFileReader.php';
-include_once dirname(__FILE__) . '/config.php';
-
-/**
- * Main controller of actions
- */
-class ConfigEditor_Controller {	
-	
-	/**
-	 * Get Viewer for displaying UI
-	 */
-	protected function getViewer() {
-		return new ConfigEditor_Viewer();
-	}
-	
-	/**
-	 * Get Configuration file reader
-	 */
-	protected function getReader() {
-		global $__ConfigEditor_Config;		
-		$configFile = $__ConfigEditor_Config['edit.filepath'];
-		if (file_exists($configFile)) {
-			if (is_writeable($configFile)) {
-				return new ConfigFileReader(
-					$configFile, 
-					$__ConfigEditor_Config['allow.editing.variables'], // What variables to view
-					$__ConfigEditor_Config['allow.editing.variables']  // What variables to edit
-				);
-			} else {
-				return null;
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * Perform logged in user check and allow only administrators
-	 */
-	protected function authCheck() {
-		global $current_user;
-		if (is_admin($current_user)) return;
-		
-		$viewer = $this->getViewer();
-		$viewer->display(vtlib_getModuleTemplate('Vtiger', 'OperationNotPermitted.tpl'));
-		exit;
-	}
-	
-	/**
-	 * Core processing method
-	 */
-	function process(ConfigEditor_Request $request) {
-		$this->authCheck();
-		$type = $request->get('type');		
-		if ($type == 'save') {
-			$this->processSave($request);
-		} else {
-			$this->processDefault($request);
-		}
-	}
-	
-	/**
-	 * Default action
-	 */
-	protected function processDefault($request) {
-		global $currentModule;
-		
-		$configReader = $this->getReader();
-		$viewer = $this->getViewer();
-
-		if (is_null($configReader)) {
-			$viewer->assign('WARNING', 'Configuration file is not writeable!');
-		} else if ($configReader === false) {
-			$viewer->assign('WARNING', 'Configuration file not found!');
-		} else {
-			$viewer->assign('CONFIGREADER', $configReader);
-		}
-		$viewer->display(vtlib_getModuleTemplate($currentModule, 'index.tpl'));
-	}
-	
-	/**
-	 * Save action
-	 */
-	protected function processSave($request) {
-		$configReader = $this->getReader();
-
-		if ($configReader) {
-			$reqvalues = $request->values();
-			if($this->validateReqValues($reqvalues)){
-				foreach($reqvalues as $k => $v) {
-					if (preg_match("/key_([^ ]+)/", $k, $m)) {
-						$configReader->setVariableValue($m[1], vtlib_purify($v));
-					}
-				}
-				$configReader->save();
-			}
-		}
-		header('Location: index.php?module=ConfigEditor&action=index');
-	}
-	
-	function validateReqValues($values){
-		$flag = true;
-		if(filter_var($values['key_HELPDESK_SUPPORT_EMAIL_ID'], FILTER_VALIDATE_EMAIL) != true) {
-			$flag = false;
-		}elseif(preg_match ('/[\'";?><]/', $values['key_HELPDESK_SUPPORT_NAME'])){
-			$flag = false;
-		}elseif(!preg_match ('/[a-zA-z0-9]/', $values['key_default_module'])){
-			$flag = false;
-		}elseif(filter_var($values['key_upload_maxsize'],FILTER_VALIDATE_INT) != true || 
-				filter_var($values['key_list_max_entries_per_page'],FILTER_VALIDATE_INT) != true ||
-				filter_var($values['key_history_max_viewed'],FILTER_VALIDATE_INT) != true || 
-				filter_var($values['key_listview_max_textlength'],FILTER_VALIDATE_INT) != true ) {
-			$flag = false;
-		}
-		return $flag;
-	}
-	
-}
-$controller = new ConfigEditor_Controller();
-$controller->process(new ConfigEditor_Request($_REQUEST));
-
-?>
\ No newline at end of file
diff --git a/pkg/vtiger/modules/ConfigEditor/modules/ConfigEditor/language/en_us.lang.php b/pkg/vtiger/modules/ConfigEditor/modules/ConfigEditor/language/en_us.lang.php
deleted file mode 100644
index 63878f3eee35e849ba2ced84e56a82c58a648d33..0000000000000000000000000000000000000000
--- a/pkg/vtiger/modules/ConfigEditor/modules/ConfigEditor/language/en_us.lang.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************/
-$mod_strings = Array (
-	
-	'ConfigEditor' => 'ConfigEditor',
-	'LBL_CONFIG_EDITOR' => 'Configuration Editor',
-	'LBL_SETTINGS' => 'Settings',
-	'LBL_CONFIG_EDIT'=>'Edit the Configuration details of vtiger CRM',
-	'SINGLE_ConfigEditor' => 'ConfigEditor',
-	'LBL_TRUE'=> 'true',
-	'LBL_FALSE'=> 'false',
-	'LBL_MAX_UPLOAD_SIZE_MSG'=> 'Maximum upload size is 5MB',
-	'LBL_INVALID_EMAIL_MSG'=>'Invalid Email Address',
-	'LBL_EMPTY_NAME_MSG'=> 'Support Name cannot be empty',
-	'LBL_MAX_LISTVIEW_ENTRIES_MSG'=>'Maximum entries in the ListView is 100',
-	'LBL_MAX_HISTORY_VIEWED_MSG'=>'Please enter a number in the range 1-5',
-	'LBL_MAX_TEXTLENGTH_LISTVIEW_MSG'=>'Maximum text length is 100',
-	'LBL_MB'=>'MB',
-	'LBL_MINI_CALENDAR_DISPLAY' => 'Mini Calendar Display',
-	'LBL_WORLD_CLOCK_DISPLAY'=>'World Clock Display',
-	'LBL_CALCULATOR_DISPLAY'=>'Calculator Display',
-	'LBL_USE_RTE'=>'Use RTE',
-	'LBL_HELPDESK_SUPPORT_EMAILID'=>'Helpdesk Support Email-Id',
-	'LBL_HELPDESK_SUPPORT_NAME'=>'Helpdesk Support Name',
-	'LBL_MAX_UPLOAD_SIZE'=>'Max.Upload Size  (Max 5MB)',
-	'LBL_MAX_HISTORY_VIEWED'=>'Max. History Viewed',
-	'LBL_DEFAULT_MODULE'=>'Default Module',
-	'LBL_MAX_TEXT_LENGTH_IN_LISTVIEW'=>'Max. text length in listview',
-	'LBL_MAX_ENTRIES_PER_PAGE_IN_LISTVIEW'=>'Max. entries per page in listview',
-	'LBL_CONFIG_FILE'=>'config.inc.php',
-	'LBL_CONFIG_EDIT_CAUTION_INFO' =>'You are editing the configuration details of vtiger CRM.',
-	'LBL_DOUBLE_CHECK_INFO'=>'Please do double check before saving the values.',
-	'LBL_HELP_INFO'=>"This is used as a 'From email-id' to send a mail to a new user created about his login credentials,
-					send a mail to trouble-ticket owner about the ticket assigned,send a mail about reminder and notification.",
-	'LBL_RESTRICTED_CHARACTERS'=>"Special characters like ' &#34 and ; are not allowed",
-
-);
-
-?>
\ No newline at end of file
diff --git a/pkg/vtiger/modules/ConfigEditor/templates/index.tpl b/pkg/vtiger/modules/ConfigEditor/templates/index.tpl
deleted file mode 100644
index 9548975e06afbb705969a46946208d6b191cdf98..0000000000000000000000000000000000000000
--- a/pkg/vtiger/modules/ConfigEditor/templates/index.tpl
+++ /dev/null
@@ -1,280 +0,0 @@
-{*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************}
-{literal}
-<style type="text/css">
-.detailedViewTextBoxThisOn {
-	background-color:#FFFFDD;
-	border:1px solid #BABABA;
-	color:#000000;
-	font-family:Arial,Helvetica,sans-serif;
-	font-size:11px;
-	padding-left:5px;
-	width:20%;
-}
-
-.detailedViewTextBoxThis {
-	background-color:#FFFFFF;
-	border:1px solid #BABABA;
-	color:#000000;
-	font-family:Arial,Helvetica,sans-serif;
-	font-size:11px;
-	padding-left:5px;
-	width:20%;
-}
-</style>
-	<script type="text/javascript">
-		function msg()
-		{
-			alert("invalid entry");
-			exit;
-		}
-
-		function trim(str)
-		{
-			while (str.substring(0,1) == ' ') // check for white spaces from beginning
-			{
-				str = str.substring(1, str.length);
-			}
-			while (str.substring(str.length-1, str.length) == ' ') // check white space from end
-			{
-				str = str.substring(0,str.length-1);
-			}
-			return str;
-		}
-
-		function valid(name) {
-			var reg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/;
-			var id=document.getElementById('key_HELPDESK_SUPPORT_EMAIL_ID');
-			var name = document.getElementById('key_HELPDESK_SUPPORT_NAME');
-			var size = document.getElementById('key_upload_maxsize');
-			var maxEntries = document.getElementById('key_list_max_entries_per_page');
-			var history1 = document.getElementById('key_history_max_viewed');
-			var maxtext = document.getElementById('key_listview_max_textlength');
-			var reg1 = /^([0-9]*)$/;
-			name.value = trim(name.value);
-			if ((name.value).indexOf("\"") != -1 || (name.value).indexOf("'") != -1 || (name.value).indexOf(";") != -1){
-				var invalidSupportName = document.getElementById('invalidSupportName').value;
-				document.getElementById('msg_HELPDESK_SUPPORT_NAME').innerHTML = invalidSupportName;
-				name.focus();
-				return false;
-			}
-
-			maxEntries.value = trim(maxEntries.value);
-			size.value = trim(size.value);
-			history1.value = trim(history1.value);
-			maxtext.value = trim(maxtext.value);
-			var uploadSize = document.getElementById('uploadSize').value;
-			var invalidEmail = document.getElementById('invalidEmail').value;
-			var emptyName = document.getElementById('emptyName').value;
-			var maxListEntries= document.getElementById('maxListEntries').value;
-			var maxHistory= document.getElementById('maxHistory').value;
-			var maxTextLength= document.getElementById('maxTextLength').value;
-			if(reg.test(id.value) == false){
-				document.getElementById('msg_HELPDESK_SUPPORT_EMAIL_ID').innerHTML = invalidEmail;
-				id.focus();
-				return false;
-			}else if(name.value == ''){
-				document.getElementById('msg_HELPDESK_SUPPORT_NAME').innerHTML = emptyName;
-				name.focus();
-				return false;
-			}else if((reg1.test(size.value) == false) || (size.value <= 0) || (size.value > 5) || (size.value == NaN)){
-				document.getElementById('msg_upload_maxsize').innerHTML =uploadSize;
-				size.focus();
-				return false;
-			}else if((reg1.test(maxEntries.value) == false)||(maxEntries.value <= 0) || (maxEntries.value>100)){
-				document.getElementById('msg_list_max_entries_per_page').innerHTML=maxListEntries;
-				maxEntries.focus();
-				return false;
-			}else if((reg1.test(history1.value) == false)||(history1.value <= 0) || (history1.value > 5)){
-				document.getElementById('msg_history_max_viewed').innerHTML=maxHistory;
-				history1.focus();
-				return false;
-			}else if((reg1.test(maxtext.value) == false) || (maxtext.value < 0) || (maxtext.value > 100) || (maxtext.value === "")){
-				document.getElementById('msg_listview_max_textlength').innerHTML=maxTextLength;
-				maxtext.focus();
-				return false;
-			}
-			return true;
-		}
-
-
-	</script>
-{/literal}
-<script language="JavaScript" type="text/javascript" src="modules/{$MODULE}/{$MODULE}.js"></script>
-<body onload="replaceUploadSize();">
-<input type="hidden" value="{$MOD.LBL_MAX_UPLOAD_SIZE_MSG}" id="uploadSize"></input>
-<input type="hidden" value="{$MOD.LBL_INVALID_EMAIL_MSG}" id="invalidEmail"></input>
-<input type="hidden" value="{$MOD.LBL_RESTRICTED_CHARACTERS}" id="invalidSupportName"></input>
-<input type="hidden" value="{$MOD.LBL_MAX_LISTVIEW_ENTRIES_MSG}" id="maxListEntries"></input>
-<input type="hidden" value="{$MOD.LBL_MAX_HISTORY_VIEWED_MSG}" id="maxHistory"></input>
-<input type="hidden" value="{$MOD.LBL_MAX_TEXTLENGTH_LISTVIEW_MSG}" id="maxTextLength"></input>
-<input type="hidden" value="{$MOD.LBL_EMPTY_NAME_MSG}" id="emptyName"></input>
-<input type="hidden" value="{$MOD.LBL_HELP_INFO}" id="helpInfo"></input>
-
-<table cellspacing="0" cellpadding="2" border="0" width="100%" class="level2Bg">
-	<tbody>
-		<tr>
-			<td>
-				<table cellspacing="0" cellpadding="0" border="0">
-					<tbody>
-						<tr>
-							<td nowrap="" class="level2SelTab"><a href="index.php?module=Settings&amp;action=index&amp;parenttab=Settings">Settings</a></td>
-							<td nowrap="" class="level2SelTab"><a href="index.php?module=Settings&amp;action=ModuleManager&amp;parenttab=Settings">Module Manager</a></td>
-						</tr>
-					</tbody>
-				</table>
-			</td>
-		</tr>
-	</tbody>
-</table>
-
-<table border=0 cellspacing=0 cellpadding=0 width=98% align=center>
-	<tr>
-		<td>
-			&nbsp;
-		</td>
-	</tr>
-	<tr>
-		<td valign=top align=right width=8><img src="{'showPanelTopLeft.gif'|@vtiger_imageurl:$THEME}"></td>
-		<td class="showPanelBg" valign="top" width="100%" >
-
-			<div style="padding: 20px;">
-				<form onsubmit="VtigerJS_DialogBox.block();" action="index.php" method="POST" name="EditView">
-					<div align="center">
-						{include file="SetMenu.tpl"}
-						<table cellspacing="0" cellpadding="5" border="0" width="100%" class="settingsSelUITopLine">
-							<tbody>
-								<tr>
-									<td width="50" valign="top" rowspan="2"><img height="48" border="0" width="48" title="Users" alt="Users" src="themes/images/migrate.gif"></td>
-									<td valign="bottom" class="heading2"><b><a href="index.php?module=Settings&amp;action=index&amp;parenttab=Settings">{$MOD.LBL_SETTINGS}</a> &gt; {$MOD.LBL_CONFIG_EDITOR} </b></td>
-								</tr>
-								<tr>
-									<td valign="top"class="small">{$MOD.LBL_CONFIG_EDIT}</td>
-								</tr>
-							</tbody>
-						</table>
-						<br>
-						<br>
-						<table width="95%" cellspacing="0" cellpadding="0" border="0" class="small" align="center">
-							<tr>
-								<td>
-									<table width="100%" cellspacing="0" cellpadding="3" border="0" class="small">
-									<tr>
-										<td nowrap="" style="width: 10px;" class="dvtTabCache">&nbsp;</td>
-										<td width="75" nowrap="" align="center" class="dvtSelectedCell" style="width: 15%;"><b>{$MOD.LBL_CONFIG_FILE}</b></td>
-										<td nowrap="" align="center" style="width: 100px;" class="dvtTabCache">
-										{if $WARNING}
-										<div style='background-color: #FFFABF; padding: 2px; margin: 0 0 2px 0; border: 1px solid yellow'>
-										<b style='color: red'>{$WARNING}</b>
-										{/if}&nbsp;
-										</td>
-										<td nowrap="" style="width: 65%;" class="dvtTabCache">&nbsp;</td>
-									</tr>
-									</table>
-								</td>
-							</tr>
-							<tr>
-								<td valign="top" align="left">
-									<div id="basicTab">
-										<table border=0 cellspacing=0 cellpadding=3 width=100% class="dvtContentSpace">
-											<tr>
-												<td align="left" style="padding:10px;">
-													<table border=0 cellspacing=0 cellpadding=5 width=100% class="small">
-														<tr>
-															<td colspan=2>
-																<div align="center">
-																	<input type='submit' class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="if(valid(this)){ldelim}return true;{rdelim}else{ldelim}return false;{rdelim}">
-																	<input type='button' class="crmbutton small cancel" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" onclick="location.href='index.php?module=Settings&action=index&parenttab=Settings'">
-
-																	<input type='hidden' name='module' value='ConfigEditor'>
-																	<input type='hidden' name='action' value='ConfigEditorAjax'>
-																	<input type='hidden' name='file' value='index'>
-																	<input type='hidden' name='type' value='save'>
-
-																</div>
-															</td>
-														</tr>
-														{if $CONFIGREADER}
-														<tr>
-															<td class="detailedViewHeader" colspan="2">
-																{$MOD.LBL_CONFIG_EDIT_CAUTION_INFO}<b>{$MOD.LBL_DOUBLE_CHECK_INFO}</b>
-															</td>
-														</tr>
-														{/if}
-
-														{foreach item=CONFIGLINE from=$CONFIGREADER->getAll()}
-															{if $CONFIGLINE->isViewable() || $CONFIGLINE->isEditable()}
-
-																{assign var="VARMETA" value=$CONFIGLINE->meta()}
-
-																<tr bgcolor=white valign=center style="height:25px;">
-																	<td class="dvtCellLabel" width="15%">
-																		{if $VARMETA.label}
-																			{if $VARMETA.label == 'Helpdesk Support Email-Id'}
-																				{$VARMETA.label} <img border="0" src="themes/images/help_icon.gif" onclick="vtlib_field_help_show_this(this, '{$CONFIGLINE->variableName()}' );" style="cursor: pointer;">
-																			{else}
-																				{$VARMETA.label}
-																			{/if}
-																		{else}
-																			{$CONFIGLINE->variableName()}
-																		{/if}
-																	</td>
-																	<td class="dvtCellInfo">
-																		{if $CONFIGLINE->isEditable()}
-																			{if $VARMETA.values}
-																				<select class="small" name="key_{$CONFIGLINE->variableName()}" id="key_{$CONFIGLINE->variableName()}">
-																				{foreach item=VARVALUEOPTION key=VARVALUEOPTIONKEY from=$VARMETA.values}
-																					<option value="{$VARVALUEOPTIONKEY}" {if $CONFIGLINE->variableValue() eq $VARVALUEOPTIONKEY}selected=true{/if}>{$VARVALUEOPTION}</option>
-																				{/foreach}
-																				</select>
-																			{else}
-																				<b><span class="warning" id="msg_{$CONFIGLINE->variableName()}"></span></b>
-																				{if $CONFIGLINE->variableName() == 'upload_maxsize'}
-																				<input size="2" type="text" name="key_{$CONFIGLINE->variableName()}" id="key_{$CONFIGLINE->variableName()}" value="{$CONFIGLINE->variableValue()}"  onblur="class='detailedViewTextBoxThis'" onfocus="class='detailedViewTextBoxThisOn'" class="detailedViewTextBoxThis" >     {$MOD.LBL_MB}
-																				{else}
-																				<input type="text" name="key_{$CONFIGLINE->variableName()}" id="key_{$CONFIGLINE->variableName()}" value="{$CONFIGLINE->variableValue()}"  onblur="this.className='detailedViewTextBox'" onfocus="this.className='detailedViewTextBoxOn'" class="detailedViewTextBox" >
-																				{/if}
-																			{/if}
-																		{else}
-																			{$CONFIGLINE->variableValue()}
-																		{/if}
-																	</td>
-																</tr>
-															{/if}
-														{/foreach}
-													</table>
-
-													<tr>
-														<td colspan=2>
-															<div align="center">
-																<input type='submit' class="crmbutton small save" value="{$APP.LBL_SAVE_LABEL}" onclick="if(valid(this)){ldelim}return true;{rdelim}else{ldelim}return false;{rdelim}">
-																<input type='button' class="crmbutton small cancel" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" onclick="location.href='index.php?module=Settings&action=index&parenttab=Settings'">
-
-																<input type='hidden' name='module' value='ConfigEditor'>
-																<input type='hidden' name='action' value='ConfigEditorAjax'>
-																<input type='hidden' name='file' value='index'>
-																<input type='hidden' name='type' value='save'>
-															</div>
-														</td>
-													</tr>
-												</td>
-											</tr>
-										</table>
-									</div>
-								</td>
-							</tr>
-						</table>
-					</div>
-				</form>
-			</div>
-		</td>
-		<td valign=top align=right><img src="{'showPanelTopRight.gif'|@vtiger_imageurl:$THEME}"></td>
-	</tr>
-</table>
-</body>
diff --git a/pkg/vtiger/modules/CronTasks/manifest.xml b/pkg/vtiger/modules/CronTasks/manifest.xml
deleted file mode 100644
index 93cb4f71e4c82a9da431e7199cfb0310a2a2e547..0000000000000000000000000000000000000000
--- a/pkg/vtiger/modules/CronTasks/manifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0'?>
-<module>
-	<name>CronTasks</name>
-	<label>CronTasks</label>
-	<parent></parent>
-	<type>extension</type>
-	<version>1.2</version>
-	<dependencies>
-		<vtiger_version>5.3.1</vtiger_version>
-		<vtiger_max_version>7.*</vtiger_max_version>
-	</dependencies>
-</module>
diff --git a/pkg/vtiger/modules/CronTasks/modules/CronTasks/CronSequence.php b/pkg/vtiger/modules/CronTasks/modules/CronTasks/CronSequence.php
deleted file mode 100644
index 50487033e9ca5238dd12685ae8ba4189c9c3106e..0000000000000000000000000000000000000000
--- a/pkg/vtiger/modules/CronTasks/modules/CronTasks/CronSequence.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/*+*******************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ********************************************************************************/
-global $adb,$log;
-
-$id = $_REQUEST['record'];
-$move  = $_REQUEST['move'];
-$log->fatal("$id,$move");
-
-if($move == 'Down'){
-	$sequence = $adb->pquery("SELECT sequence FROM vtiger_cron_task WHERE id = ?", array($id));
-	$oldsequence = $adb->query_result($sequence,0,'sequence');
-
-	$nexttab = $adb->pquery("SELECT sequence,id FROM vtiger_cron_task WHERE sequence > ? ORDER BY SEQUENCE LIMIT 0,1", array($oldsequence));
-	$newsequence = $adb->query_result($nexttab,0,'sequence');
-	$rightid = $adb->query_result($nexttab,0,'id');
-
-	$adb->pquery("UPDATE vtiger_cron_task set sequence=? WHERE id = ?", array($newsequence, $id));
-	$adb->pquery("UPDATE vtiger_cron_task set sequence=? WHERE id = ?", array($oldsequence, $rightid));
-}elseif ($move == 'Up') {
-	$sequence = $adb->pquery("SELECT sequence FROM vtiger_cron_task WHERE id = ?", array($id));
-	$oldsequence = $adb->query_result($sequence,0,'sequence');
-          
-	$nexttab = $adb->pquery("SELECT sequence,id FROM vtiger_cron_task WHERE sequence < ? ORDER BY SEQUENCE DESC LIMIT 0,1", array($oldsequence));
-	$newsequence = $adb->query_result($nexttab,0,'sequence');
-	$leftid = $adb->query_result($nexttab,0,'id');
-
-	$adb->pquery("UPDATE vtiger_cron_task SET sequence=? WHERE id = ?", array($newsequence, $id));
-	$adb->pquery("UPDATE vtiger_cron_task SET sequence=? WHERE id = ?", array($oldsequence, $leftid));
-
-}
-$loc = "Location: index.php?action=CronTasksAjax&file=ListCronJobs&module=CronTasks&directmode=ajax";
-header($loc);
-?>
diff --git a/pkg/vtiger/modules/CronTasks/modules/CronTasks/CronTasks.js b/pkg/vtiger/modules/CronTasks/modules/CronTasks/CronTasks.js
deleted file mode 100644
index e274fd186bd64d4a57346400d9c941ef1f05badf..0000000000000000000000000000000000000000
--- a/pkg/vtiger/modules/CronTasks/modules/CronTasks/CronTasks.js
+++ /dev/null
@@ -1,86 +0,0 @@
-/*********************************************************************************
-** The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
-************************************************************************************/
-
-function fetchSaveCron(id)
-{
-
-	var status = $("cron_status").value;
-	var timeValue= $("CronTime").value;
-	var time = $("cron_time").value;
-	var min_freq =parseInt($("min_freq").value,10);
-	if(!numValidate("CronTime","","any",true)){
-		return false;
-	}
-	if((timeValue % 1) !=0){
-		alert("only integer values are allowed");
-		return false;
-	}
-	if((timeValue < min_freq && time == "min") || timeValue <= 0 || timeValue == '' ){
-		alert($("desc").value);
-
-	}
-	else{
-		$("editdiv").style.display="none";
-		$("status").style.display="inline";
-		new Ajax.Request(
-			'index.php',
-			{
-				queue: {
-					position: 'end',
-					scope: 'command'
-				},
-				method: 'post',
-				postBody: 'action=CronTasksAjax&module=CronTasks&file=SaveCron&record='+id+'&status='+status+'&timevalue='+timeValue+'&time='+time,
-				onComplete: function(response) {
-					$("status").style.display="none";
-					$("notifycontents").innerHTML=response.responseText;
-				}
-			}
-			);
-	}
-}
-
-function fetchEditCron(id)
-{
-	$("status").style.display="inline";
-	new Ajax.Request(
-		'index.php',
-		{
-			queue: {
-				position: 'end',
-				scope: 'command'
-			},
-			method: 'post',
-			postBody: 'action=CronTasksAjax&module=CronTasks&file=EditCron&record='+id,
-			onComplete: function(response) {
-				$("status").style.display="none";
-				$("editdiv").innerHTML=response.responseText;
-			}
-		}
-		);
-}
-function move_module(tabid,move){
-
-	//$('vtbusy_info').style.display = "block";
-	new Ajax.Request(
-		'index.php',
-		{
-			queue: {
-				position: 'end',
-				scope: 'command'
-			},
-			method: 'post',
-			postBody: 'module=CronTasks&action=CronTasksAjax&file=CronSequence&parenttab=Settings&record='+tabid+'&move='+move,
-			onComplete: function(response) {
-				$("notifycontents").innerHTML=response.responseText;
-
-			}
-		}
-		);
-}
diff --git a/pkg/vtiger/modules/CronTasks/modules/CronTasks/CronTasks.php b/pkg/vtiger/modules/CronTasks/modules/CronTasks/CronTasks.php
deleted file mode 100644
index be4e6f542dd71a29c47a69466e627fd25569ee00..0000000000000000000000000000000000000000
--- a/pkg/vtiger/modules/CronTasks/modules/CronTasks/CronTasks.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/*+********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- *******************************************************************************/
- 
-class CronTasks {
- 	
- 	/**
-	* Invoked when special actions are performed on the module.
-	* @param String Module name
-	* @param String Event Type
-	*/
-	function vtlib_handler($moduleName, $eventType) {
- 					
-		require_once('include/utils/utils.php');			
-		global $adb,$mod_strings;
-
-		if($eventType == 'module.postinstall') {
-		$fieldid = $adb->getUniqueID('vtiger_settings_field');
-		$blockid = getSettingsBlockId('LBL_OTHER_SETTINGS');
-		$seq_res = $adb->pquery("SELECT max(sequence) AS max_seq FROM vtiger_settings_field WHERE blockid = ?", array($blockid));
-			if ($adb->num_rows($seq_res) > 0) {
-				$cur_seq = $adb->query_result($seq_res, 0, 'max_seq');
-				if ($cur_seq != null)	$seq = $cur_seq + 1;
-			}
-			
-		$adb->pquery('INSERT INTO vtiger_settings_field(fieldid, blockid, name, iconpath, description, linkto, sequence) 
-				VALUES (?,?,?,?,?,?,?)', array($fieldid, $blockid, 'Scheduler', 'Cron.png', 'Allows you to Configure Cron Task', 'index.php?module=CronTasks&action=ListCronJobs&parenttab=Settings', $seq));
-		}	
-	}
-}
diff --git a/pkg/vtiger/modules/CronTasks/modules/CronTasks/CronTasksAjax.php b/pkg/vtiger/modules/CronTasks/modules/CronTasks/CronTasksAjax.php
deleted file mode 100644
index 4529abde38429a64bd7ca39b10d816fb843c15dc..0000000000000000000000000000000000000000
--- a/pkg/vtiger/modules/CronTasks/modules/CronTasks/CronTasksAjax.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/*********************************************************************************
-** The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
-*
- ********************************************************************************/
-require_once('include/Ajax/CommonAjax.php');
-?>
diff --git a/pkg/vtiger/modules/CronTasks/modules/CronTasks/EditCron.php b/pkg/vtiger/modules/CronTasks/modules/CronTasks/EditCron.php
deleted file mode 100644
index a4cf02e3061f5be30997c91d983d08845d1da608..0000000000000000000000000000000000000000
--- a/pkg/vtiger/modules/CronTasks/modules/CronTasks/EditCron.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/*********************************************************************************
-** The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
-*
- ********************************************************************************/
-
-require_once('config.php');
-require_once('vtlib/Vtiger/Cron.php');
-require_once('config.inc.php');
-global $mod_strings, $app_strings, $current_language;
-global $theme;
-$theme_path="themes/".$theme."/";
-$image_path=$theme_path."images/";
-
-$smarty = new vtigerCRM_Smarty;
-if(isset($_REQUEST['record']) && $_REQUEST['record']!='') {
-    $id = $_REQUEST['record'];
-    $cronTask = Vtiger_cron::getInstanceById($id);
-    $label = getTranslatedString($cronTask->getName(),$cronTask->getModule());
-    $cron_status = $cronTask->getStatus();
-    $cron_freq =  $cronTask->getFrequency();
-    $cron_desc = $cronTask->getDescription();
-    $cron = Array();
-    $cron['label'] = $label;
-    if($cron_freq/(60*60)>1 && is_int($cron_freq/(60*60))){
-        $cron['frequency']=(int)($cron_freq/(60*60));
-        $cron['time'] = 'hour';
-    }
-    else{
-        $cron['frequency']=(int)($cron_freq/60);
-        $cron['time'] = 'min';
-    }
-    $cron['status'] = $cron_status;
-    $cron['description'] = $cron_desc;
-    $cron['id']=$id;
-
-
-    $smarty->assign("CRON_DETAILS",$cron);
-    $smarty->assign("MOD", return_module_language($current_language,'CronTasks'));
-    $smarty->assign("THEME", $theme);
-    $smarty->assign("IMAGE_PATH",$image_path);
-    $smarty->assign("APP", $app_strings);
-    $smarty->assign("CMOD", $mod_strings);
-    $smarty->assign("MIN_CRON_FREQUENCY", getMinimumCronFrequency());
-    $smarty->display("modules/CronTasks/EditCron.tpl");
-}
-else {
-    header("Location:index.php?module=CronTasks&action=ListCronJobs&directmode=ajax");
-}
-?>
diff --git a/pkg/vtiger/modules/CronTasks/modules/CronTasks/ListCronJobs.php b/pkg/vtiger/modules/CronTasks/modules/CronTasks/ListCronJobs.php
deleted file mode 100644
index 7a39ae4a897efad9712cc47f0417af7917e938c7..0000000000000000000000000000000000000000
--- a/pkg/vtiger/modules/CronTasks/modules/CronTasks/ListCronJobs.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/*********************************************************************************
-** The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
-*
- ********************************************************************************/
-
-require_once('vtlib/Vtiger/Cron.php');
-require_once ('include/utils/utils.php');
-
-global $theme,$app_strings,$mod_strings,$current_language;
-$theme_path="themes/".$theme."/";
-$image_path=$theme_path."images/";
-$smarty = new vtigerCRM_Smarty;
-$cronTasks = Vtiger_Cron::listAllActiveInstances(1);
-$output = Array();
-
-foreach ($cronTasks as $cronTask) {
-	$out = Array();
-	$cron_id = $cronTask->getId();
-	$cron_mod = $cronTask->getName();
-	$cron_freq = $cronTask->getFrequency();
-	$cron_st = $cronTask->getStatus();
-	if($cronTask->getLastStart() != 0) {
-		$start_ts = $cronTask->getLastStart();
-		$end_ts = time();
- 	    $cron_started = dateDiffAsString($start_ts, $end_ts);
-	}
-	else {
-		$cron_started = '';
-	}
-	if($cronTask->getLastEnd() != 0) {
-		$start_ts = $cronTask->getLastEnd();
-		$end_ts = time();
- 	    $cron_end = dateDiffAsString($start_ts, $end_ts);
-	}
-	else {
-		$cron_end = '';
-	}
-	$out ['cronname'] = getTranslatedString($cron_mod,$cronTask->getModule());
-
-	$out['hours'] = str_pad((int)(($cron_freq/(60*60))),2,0,STR_PAD_LEFT);
-	$out['mins'] =str_pad((int)(($cron_freq%(60*60))/60),2,0,STR_PAD_LEFT);
-	$out ['id'] = $cron_id;
-	$out ['status'] = $cron_st;
-	$out['laststart']= $cron_started;
-	$out['lastend'] =$cron_end;
-	if($out['status'] == Vtiger_Cron::$STATUS_DISABLED )
-		$out['status'] = $mod_strings['LBL_INACTIVE'];
-	elseif($out['status'] == Vtiger_Cron::$STATUS_ENABLED)
-		$out['status'] = $mod_strings['LBL_ACTIVE'];
-	else
-		$out['status'] = $mod_strings['LBL_RUNNING'];
-
-	$output [] = $out;
-}
-
-$smarty->assign("CRON",$output);
-$smarty->assign("MOD", return_module_language($current_language,'CronTasks'));
-$smarty->assign("MIN_CRON_FREQUENCY",getMinimumCronFrequency());
-$smarty->assign("THEME", $theme);
-$smarty->assign("IMAGE_PATH",$image_path);
-$smarty->assign("APP", $app_strings);
-$smarty->assign("CMOD", $mod_strings);
-
-if($_REQUEST['directmode'] != '')
-	$smarty->display("modules/CronTasks/CronContents.tpl");
-else {
-	$smarty->display("modules/CronTasks/Cron.tpl");
-}
-?>
diff --git a/pkg/vtiger/modules/CronTasks/modules/CronTasks/SaveCron.php b/pkg/vtiger/modules/CronTasks/modules/CronTasks/SaveCron.php
deleted file mode 100644
index d85cc61a6f115d9003b7ef53e62140ec2a9b385e..0000000000000000000000000000000000000000
--- a/pkg/vtiger/modules/CronTasks/modules/CronTasks/SaveCron.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/*********************************************************************************
-** The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
-*
- ********************************************************************************/
-
-require_once('include/database/PearDatabase.php');
-require_once('include/utils/VtlibUtils.php');
-require_once('vtlib/Vtiger/Cron.php');
-global $adb;
-if(isset($_REQUEST['record']) && $_REQUEST['record']!='') {
-    $cronTask = Vtiger_Cron::getInstanceById($_REQUEST['record']);
-    $cronTask->updateStatus($_REQUEST['status']);
-    if($_REQUEST['timevalue'] != '') {
-
-        if($_REQUEST['time'] == 'min') {
-
-            $time = $_REQUEST['timevalue']*60;
-        }
-        else {
-            $time = $_REQUEST['timevalue']*60*60;
-        }
-        $cronTask->updateFrequency($time);
-    }
-}
-$loc = "Location: index.php?action=CronTasksAjax&file=ListCronJobs&module=CronTasks&directmode=ajax";
-header($loc);
-?>
diff --git a/pkg/vtiger/modules/CronTasks/modules/CronTasks/language/en_us.lang.php b/pkg/vtiger/modules/CronTasks/modules/CronTasks/language/en_us.lang.php
deleted file mode 100644
index dfe2cd774aa67918287c8356c3816a824d655863..0000000000000000000000000000000000000000
--- a/pkg/vtiger/modules/CronTasks/modules/CronTasks/language/en_us.lang.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/** YOUR LICENSE TEXT HERE **/
-$mod_strings = Array (
-	'LBL_ACTIVE' => 'Active',
-	'LBL_INACTIVE' => 'InActive',
-	'LBL_STATUS' => 'Status',
-	'LBL_SCHEDULER' => 'Scheduler',
-	'LBL_SETTINGS' => 'Settings',
-	'LBL_FREQUENCY'=> 'Frequency',
-	'LBL_HOURMIN' => '(H:M)',
-	'LAST_START'=>'Last Scan Started',
-	'LAST_END'=>'Last Scan Ended',
-	'LBL_SEQUENCE'=>'Sequence',
-	'LBL_TOOLS' =>'Tools',
-	'LBL_DAYS'=>'Days',
-	'LBL_HOURS'=>'Hours',
-	'LBL_MINS'=>'Mins',
-	'LBL_RUNNING'=>'Running',
-	'LBL_MINIMUM_FREQUENCY'=>'Frequency of any cron job  configured should be greater than',
-	'LBL_SECONDS'=>'sec ago',
-	'LBL_MINUTES'=>'min(s) ago',
-	'LBL_HOURS'=>'hr(s) ago',
-	'LBL_DAYS'=>'day(s) ago',
-	'LBL_MONTHS'=>'month(s) ago',
-	'LBL_YEARS'=>'year(s) ago',
-);
-?>
\ No newline at end of file
diff --git a/pkg/vtiger/modules/CronTasks/templates/Cron.tpl b/pkg/vtiger/modules/CronTasks/templates/Cron.tpl
deleted file mode 100644
index fb2ad03a8ebfad27ca4b7c5a61946258377eaca3..0000000000000000000000000000000000000000
--- a/pkg/vtiger/modules/CronTasks/templates/Cron.tpl
+++ /dev/null
@@ -1,67 +0,0 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<script language="JavaScript" type="text/javascript" src="modules/CronTasks/CronTasks.js"></script><br>
-<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
-<tbody><tr>
-        <td valign="top"><img src="{'showPanelTopLeft.gif'|@vtiger_imageurl:$THEME}"></td>
-        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
-		<br>
-		<div align=center>
-			{include file='SetMenu.tpl'}
-			<!-- DISPLAY -->
-			<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
-			<tr>
-				<td width="50" rowspan="2" valign="top"><img src="{'Cron.png'|@vtiger_imageurl:$THEME}" alt="{$MOD.LBL_USERS}" width="48" height="48" border=0 title="{$MOD.LBL_USERS}"></td>
-				<td colspan="2" class="heading2" valign=bottom align="left"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.LBL_SCHEDULER} </b></td>
-				<td rowspan=2 class="small" align=right>&nbsp;</td>
-			</tr>
-			<tr>
-				<td valign=top class="small" align="left">{$MOD.LBL_SCHEDULER}</td>
-			</tr>
-			</table>
-			<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
-				<tr><td>&nbsp;</td></tr>
-			</table>
-			<table width="100%" border="0" cellpadding="5" cellspacing="0" class="listTableTopButtons">
-                <tr >
-                    <td  style="padding-left:5px;" class="big">{$MOD.LBL_SCHEDULER}</td>
-                    <td align="right">&nbsp;</td>
-                </tr>
-			  </table>
-
-	<div id="notifycontents">
-	{include file='modules/CronTasks/CronContents.tpl'}
-	</div>
-
-	<table border=0 cellspacing=0 cellpadding=5 width=100% >
-	<tr><td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td></tr>
-	</table>
-	</td>
-	</tr>
-	</table>
-	</td>
-	</tr>
-	</table>
-	</td>
-	</tr>
-	</table>
-
-	</div>
-
-</td>
-        <td valign="top"><img src="{'showPanelTopRight.gif'|@vtiger_imageurl:$THEME}"></td>
-   </tr>
-</tbody>
-</table>
-	<div id="editdiv" style="display:none;position:absolute;width:450px;"></div>
diff --git a/pkg/vtiger/modules/CronTasks/templates/CronContents.tpl b/pkg/vtiger/modules/CronTasks/templates/CronContents.tpl
deleted file mode 100644
index 5e818afd0bf6154d0714b1b4dde4b56f023358f1..0000000000000000000000000000000000000000
--- a/pkg/vtiger/modules/CronTasks/templates/CronContents.tpl
+++ /dev/null
@@ -1,53 +0,0 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<table width="100%" cellpadding="5" cellspacing="0" class="listTable" >
-	<tr>
-	<td class="colHeader small" width="5%">#</td>
-	<td class="colHeader small" width="20%">Cron Job</td>
-	<td class="colHeader small" width="15%">{$MOD.LBL_FREQUENCY}{$MOD.LBL_HOURMIN}</td>
-	<td class="colHeader small" width="10%">{$CMOD.LBL_STATUS}</td>
-        <td class="colHeader small" width="20%">{$MOD.LAST_START}</td>
-        <td class="colHeader small" width="15%">{$MOD.LAST_END}</td>
-        <td class="colHeader small" width='10%'>{$MOD.LBL_SEQUENCE}</td>
-        <td class="colHeader small" width="5%">{$MOD.LBL_TOOLS}</td>
-	</tr>
-	{foreach name=cronlist item=elements from=$CRON}
-	<tr>
-	<td class="listTableRow small">{$smarty.foreach.cronlist.iteration}</td>
-	<td class="listTableRow small">{$elements.cronname}</td>
-	<td class="listTableRow small">{$elements.days} {$elements.hours}:{$elements.mins}</td>
-	{if $elements.status eq 'Active'}
-	<td class="listTableRow small active">{$elements.status}</td>
-	{else}
-	<td class="listTableRow small inactive">{$elements.status}</td>
-	{/if}
-        <td class="listTableRow small">{$elements.laststart}</td>
-        <td class="listTableRow small">{$elements.lastend}</td>
-	{if $smarty.foreach.cronlist.first neq true}
-		<td  align="center" class="listTableRow"><a href="javascript:move_module('{$elements.id}','Up');" ><img src="{'arrow_up.png'|@vtiger_imageurl:$THEME}" style="width:16px;height:16px;" border="0" /></a>
-	{/if}
-	{if $smarty.foreach.cronlist.last eq true}
-		<img src="{'blank.gif'|@vtiger_imageurl:$THEME}" style="width:16px;height:16px;" border="0" />
-	{/if}	
-	{if $smarty.foreach.cronlist.first eq true}
-		<td align="center" class="listTableRow"><img src="{'blank.gif'|@vtiger_imageurl:$THEME}" style="width:16px;height:16px;" border="0" />
-			<a href="javascript:move_module('{$elements.id}','Down');" ><img src="{'arrow_down.png'|@vtiger_imageurl:$THEME}" style="width:16px;height:16px;" border="0" /></a></td>
-	{/if}
-	
-	{if $smarty.foreach.cronlist.last neq true && $smarty.foreach.cronlist.first neq true}
-		<a href="javascript:move_module('{$elements.id}','Down');" ><img src="{'arrow_down.png'|@vtiger_imageurl:$THEME}" style="width:16px;height:16px;" border="0" /></a></td>
-	{/if}
-        <td class="listTableRow small" align="center" ><img onClick="fnvshobj(this,'editdiv');fetchEditCron('{$elements.id}');" style="cursor:pointer;" src="{'editfield.gif'|@vtiger_imageurl:$THEME}" title="{$APP.LBL_EDIT}"></td>
-        </tr>
-	{/foreach}
-	</table>
-
diff --git a/pkg/vtiger/modules/CronTasks/templates/EditCron.tpl b/pkg/vtiger/modules/CronTasks/templates/EditCron.tpl
deleted file mode 100644
index eb158e8eaa4472f60b9d765cf8d79194f240fb00..0000000000000000000000000000000000000000
--- a/pkg/vtiger/modules/CronTasks/templates/EditCron.tpl
+++ /dev/null
@@ -1,69 +0,0 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<div id="EditInv" class="layerPopup">
-<input id="min_freq" type="hidden" value="{$MIN_CRON_FREQUENCY}">
-<input id="desc" type="hidden" value="{'LBL_MINIMUM_FREQUENCY'|@getTranslatedString:$MODULE} {$MIN_CRON_FREQUENCY} {'LBL_MINS'|@getTranslatedString:$MODULE}" size="35" maxlength="40">
-<table border=0 cellspacing=0 cellpadding=5 width=100% class=layerHeadingULine>
-<tr>
-	<td class="layerPopupHeading" align="left">{$CRON_DETAILS.label}</td>
-	<td align="right" class="small"><img onClick="hide('editdiv');" style="cursor:pointer;" src="{'close.gif'|@vtiger_imageurl:$THEME}" align="middle" border="0"></td>
-</tr>
-</table>
-<table border=0 cellspacing=0 cellpadding=5 width=100% align=center>
-<tr>
-	<td class="small">
-	<table border=0 celspacing=0 cellpadding=5 width=100% align=center bgcolor=white>
-	<tr>
-		<td align="right"  class="cellLabel small" width="40%"><b>{$MOD.LBL_STATUS} :</b></td>
-	<td align="left"  class="cellText small" width="60%">
-		<select class="small" id="cron_status" name="cron_status">
-	{if $CRON_DETAILS.status eq 1}
-		<option value="1" selected>{$MOD.LBL_ACTIVE}</option>
-		<option value="0">{$MOD.LBL_INACTIVE}</option>
-	{else}
-		<option value="1">{$MOD.LBL_ACTIVE}</option>
-		<option value="0" selected>{$MOD.LBL_INACTIVE}</option>
-	{/if}
-	</select>
-	</td>
-	</tr>
-        <tr>
-		<td align="right" class="cellLabel small"><b>{$MOD.LBL_FREQUENCY}</b></td>
-		<td align="left" class="cellText small" width="104px"><input class="txtBox" id="CronTime" name="CronTime" value="{$CRON_DETAILS.frequency}" style="width:25px;" type="text">
-                <select class="small" id="cron_time" name="cron_status">
-                {if $CRON_DETAILS.time eq 'min'}
-                 <option value="min" selected>{$MOD.LBL_MINS}</option>
-		<option value="hours">{$MOD.LBL_HOURS}</option>
-                {else}
-                 <option value="min" >{$MOD.LBL_MINS}</option>
-                 <option value="hours" selected>{$MOD.LBL_HOURS}</option>
-                {/if}
-        </td>
-        </tr>
-        <tr>
-        <td colspan=2>
-        {$CRON_DETAILS.description}
-        </td>
-        <tr>
-	</table>
-	</td>
-</tr>
-</table>
-<table border=0 cellspacing=0 cellpadding=5 width=100% class="layerPopupTransport">
-<tr>
-	<td align="center" class="small">
-		<input name="save" value="{$APP.LBL_SAVE_BUTTON_LABEL}" class="crmButton small save" type="button" onClick="fetchSaveCron('{$CRON_DETAILS.id}')">
-		<input name="cancel" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" class="crmButton small cancel" type="button" onClick="hide('editdiv');">
-	</td>
-	</tr>
-</table>
-</div>
diff --git a/pkg/vtiger/modules/CustomerPortal/modules/CustomerPortal/api.php b/pkg/vtiger/modules/CustomerPortal/modules/CustomerPortal/api.php
index 8c02e4a8a52b31b25489a01deb49ee8d56d04d06..767920a6dd012abadb8e13df2f92ab25784621ca 100644
--- a/pkg/vtiger/modules/CustomerPortal/modules/CustomerPortal/api.php
+++ b/pkg/vtiger/modules/CustomerPortal/modules/CustomerPortal/api.php
@@ -34,7 +34,9 @@ class CustomerPortal_API_EntryPoint {
 	static function process(CustomerPortal_API_Request $request) {
 		$operation = $request->getOperation();
 		$response = false;
-		preg_match("/[0-9a-zA-z]*/", $operation, $match);
+		if (!preg_match("/[0-9a-zA-z]*/", $operation, $match)) {
+			throw new Exception("Invalid entry", 1412);
+		}
 
 		if ($operation == $match[0]) {
 			$operationFile = sprintf('/apis/%s.php', $operation);
diff --git a/pkg/vtiger/modules/Google/modules/Google/connectors/Oauth2.php b/pkg/vtiger/modules/Google/modules/Google/connectors/Oauth2.php
index bbed6e2522a009dd6cf59217a8f8a15b6093fdf8..2c951e778e77f436805b8e3f6f8cdfd7997ad14d 100644
--- a/pkg/vtiger/modules/Google/modules/Google/connectors/Oauth2.php
+++ b/pkg/vtiger/modules/Google/modules/Google/connectors/Oauth2.php
@@ -61,7 +61,7 @@ class Google_Oauth2_Connector {
 		$this->client_id = Google_Config_Connector::$clientId;
 		$this->client_secret = Google_Config_Connector::$clientSecret;
 		$this->redirect_uri = Google_Config_Connector::getRedirectUrl();
-		$this->scope = $this->scopes[$this->source_module];
+		$this->scope = implode(' ', array_values($this->scopes));
     }
     
     public function getClientId() {
@@ -251,4 +251,4 @@ class Google_Oauth2_Connector {
     
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/pkg/vtiger/modules/Import/languages/en_us/Import.php b/pkg/vtiger/modules/Import/languages/en_us/Import.php
index 769d9c5c0657befad5d88e39180d16d77fde5b9a..bb960fd09fffaa4b62fb2a3a1344f7e5523ac618 100644
--- a/pkg/vtiger/modules/Import/languages/en_us/Import.php
+++ b/pkg/vtiger/modules/Import/languages/en_us/Import.php
@@ -53,6 +53,7 @@ $languageStrings = array(
 	'LBL_CANCEL_IMPORT' => 'Cancel Import',
 	'LBL_ERROR' => 'Error',
 	'LBL_CLEAR_DATA' => 'Clear Data',
+	'ERR_LOCAL_INFILE_NOT_ON' => 'local_infile variable is turned off on the database server.',
 	'ERR_UNIMPORTED_RECORDS_EXIST' => 'Unable to import more data in this batch. Please start a new import.',
 	'ERR_IMPORT_INTERRUPTED' => 'Current Import has been interrupted. Please try again later',
 	'ERR_FAILED_TO_LOCK_MODULE' => 'Failed to lock the module for import. Re-try again later',
diff --git a/pkg/vtiger/modules/Import/layouts/v7/modules/Import/ImportStepOne.tpl b/pkg/vtiger/modules/Import/layouts/v7/modules/Import/ImportStepOne.tpl
index 63cf61aa5b63447d044fe84a2e5d0fb3a947e3f0..72d070aad7f72b8a52622de17a3eb6d86e37c77e 100644
--- a/pkg/vtiger/modules/Import/layouts/v7/modules/Import/ImportStepOne.tpl
+++ b/pkg/vtiger/modules/Import/layouts/v7/modules/Import/ImportStepOne.tpl
@@ -42,7 +42,7 @@
                 </div>
             </td>
         </tr>
-        {if $FORMAT eq ''}
+        {if $FORMAT eq 'csv'}
             <tr id="has_header_container" style="height:50px">
                 <td>{'LBL_HAS_HEADER'|@vtranslate:$MODULE}</td>
                 <td>
@@ -62,7 +62,7 @@
 				</td>
 			</tr>
 		{/if}
-        {if $FORMAT eq ''}
+        {if $FORMAT eq 'csv'}
             <tr id="delimiter_container" style="height:50px">
                 <td>{'LBL_DELIMITER'|@vtranslate:$MODULE}</td>
                 <td>
diff --git a/pkg/vtiger/modules/Import/layouts/v7/modules/Import/resources/Import.js b/pkg/vtiger/modules/Import/layouts/v7/modules/Import/resources/Import.js
index 3eb57b9dae97c00ae12d62f603722eb574551651..ed213e8d09256caad9d00a83bd4539fa54b7eb14 100644
--- a/pkg/vtiger/modules/Import/layouts/v7/modules/Import/resources/Import.js
+++ b/pkg/vtiger/modules/Import/layouts/v7/modules/Import/resources/Import.js
@@ -210,7 +210,8 @@ if (typeof (Vtiger_Import_Js) == 'undefined') {
                 var header = mappingPair[0];
                 header = header.replace(/\/eq\//g, '=');
                 header = header.replace(/\/amp\//g, '&amp;');
-                mapping["'" + header + "'"] = mappingPair[1];
+				mapping[header] = mappingPair[1];
+				mapping[i] = mappingPair[1]; /* To make Row based match when there is no header */
             }
             fieldsList.each(function(i, element) {
                 var fieldElement = jQuery(element);
@@ -218,11 +219,11 @@ if (typeof (Vtiger_Import_Js) == 'undefined') {
                 var rowId = jQuery('[name=row_counter]', fieldElement).get(0).value;
                 var headerNameElement = jQuery('[name=header_name]', fieldElement).get(0);
                 var headerName = jQuery(headerNameElement).html();
-                if ("'" + headerName + "'" in mapping) {
-                    mappedFields.select2("val", mapping["'" + headerName + "'"]);
-                } else if (rowId in mapping) {
-                    mappedFields.val($rowId);
-                }
+                if (headerName in mapping) {
+                    mappedFields.select2("val", mapping[headerName]);
+				} else if (rowId-1 in mapping) { /* Row based match when there is no header - but saved map is loaded. */
+                	mappedFields.select2("val", mapping[rowId-1]);
+				}
                 Vtiger_Import_Js.loadDefaultValueWidget(fieldElement.attr('id'));
             });
         },
diff --git a/pkg/vtiger/modules/Import/modules/Import/actions/Data.php b/pkg/vtiger/modules/Import/modules/Import/actions/Data.php
index 088f1de875c9a70887b29658e90f5c4e5b922539..437f9fe7a6780810f157edcde68789edfbadccd1 100644
--- a/pkg/vtiger/modules/Import/modules/Import/actions/Data.php
+++ b/pkg/vtiger/modules/Import/modules/Import/actions/Data.php
@@ -637,9 +637,17 @@ class Import_Data_Action extends Vtiger_Action_Controller {
 
 				if (!in_array($picklistValueInLowerCase, $allPicklistValuesInLowerCase) && !empty($picklistValueInLowerCase)) {
 					if ($moduleName != 'Calendar') {
+						// Required to update runtime cache.
+						$wsFieldDetails = $fieldInstance->getPicklistDetails();
+
 						$moduleObject = Vtiger_Module::getInstance($moduleName);
 						$fieldObject = Vtiger_Field::getInstance($fieldName, $moduleObject);
 						$fieldObject->setPicklistValues(array($fieldValue));
+
+						// Update cache state with new value added.
+						$wsFieldDetails[] = array('label' => $fieldValue, 'name' => $fieldValue);
+						Vtiger_Cache::getInstance()->setPicklistDetails($moduleObject->getId(), $fieldObject->getName(), $wsFieldDetails);
+
 						unset($this->allPicklistValues[$fieldName]);
 					}
 				} else {
@@ -1160,4 +1168,4 @@ class Import_Data_Action extends Vtiger_Action_Controller {
 		return $entityIdsList;
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/pkg/vtiger/modules/Import/modules/Import/readers/CSVReader.php b/pkg/vtiger/modules/Import/modules/Import/readers/CSVReader.php
index 593063ed21513eb74526beba608e44b079af7cda..938b04281ae49d67091f772737bf796e17abc937 100644
--- a/pkg/vtiger/modules/Import/modules/Import/readers/CSVReader.php
+++ b/pkg/vtiger/modules/Import/modules/Import/readers/CSVReader.php
@@ -95,7 +95,9 @@ class Import_CSVReader_Reader extends Import_FileReader_Reader {
 		$db = PearDatabase::getInstance();
 		$tableName = Import_Utils_Helper::getDbTableName($this->user);
 		$delimiter = $this->request->get('delimiter');
-		$query = 'LOAD DATA LOCAL INFILE "'.$filePath.'" INTO TABLE '.$tableName.' FIELDS TERMINATED BY "'.$delimiter.'" OPTIONALLY ENCLOSED BY "\"" LINES TERMINATED BY "\n"';
+		$encoding  = $this->request->get('file_encoding');
+		$withEncoding = ' CHARACTER SET ' . ($encoding == 'UTF-8' ? 'UTF8' : 'latin1');
+		$query = 'LOAD DATA LOCAL INFILE "'.$filePath.'" INTO TABLE '.$tableName. $withEncoding.' FIELDS TERMINATED BY "'.$delimiter.'" OPTIONALLY ENCLOSED BY "\"" LINES TERMINATED BY "\n"';
 		if($this->hasHeader()){
 			$query .= " IGNORE 1 LINES ";
 		}
diff --git a/pkg/vtiger/modules/MailManager/layouts/v7/modules/MailManager/MailOpen.tpl b/pkg/vtiger/modules/MailManager/layouts/v7/modules/MailManager/MailOpen.tpl
index ba0e4faec75fe71caed0d5c3ed3c3ffd9318847d..11a69d5c8eddcdebbc810f1d42f7f1a13adedefc 100644
--- a/pkg/vtiger/modules/MailManager/layouts/v7/modules/MailManager/MailOpen.tpl
+++ b/pkg/vtiger/modules/MailManager/layouts/v7/modules/MailManager/MailOpen.tpl
@@ -119,13 +119,14 @@
                     {assign var=ATTACHNAME value=$ATTACHVALUE['filename']}
                     {if $INLINE_ATT[$ATTACHNAME] eq null}
                         {assign var=DOWNLOAD_LINK value=$ATTACHNAME|@escape:'url'}
+						{assign var=ATTACHID value=$ATTACHVALUE['attachid']}
                         <span>
                             <i class="fa {$MAIL->getAttachmentIcon($ATTACHVALUE['path'])}"></i>&nbsp;&nbsp;
-                            <a href="index.php?module={$MODULE}&view=Index&_operation=mail&_operationarg=attachment_dld&_muid={$MAIL->muid()}&_atname={$DOWNLOAD_LINK|@escape:'htmlall':'UTF-8'}">
+                            <a href="index.php?module={$MODULE}&view=Index&_operation=mail&_operationarg=attachment_dld&_muid={$MAIL->muid()}&_atid={$ATTACHID}&_atname={$DOWNLOAD_LINK|@escape:'htmlall':'UTF-8'}">
                                 {$ATTACHNAME}
                             </a>
                             <span>&nbsp;&nbsp;({$ATTACHVALUE['size']})</span>
-                            <a href="index.php?module={$MODULE}&view=Index&_operation=mail&_operationarg=attachment_dld&_muid={$MAIL->muid()}&_atname={$DOWNLOAD_LINK|@escape:'htmlall':'UTF-8'}">
+                            <a href="index.php?module={$MODULE}&view=Index&_operation=mail&_operationarg=attachment_dld&_muid={$MAIL->muid()}&_atid={$ATTACHID}&_atname={$DOWNLOAD_LINK|@escape:'htmlall':'UTF-8'}">
                                 &nbsp;&nbsp;<i class="fa fa-download"></i>
                             </a>
                         </span>
@@ -135,4 +136,4 @@
             </div>
         {/if}
     </div>
-{/strip}
\ No newline at end of file
+{/strip}
diff --git a/pkg/vtiger/modules/MailManager/layouts/v7/modules/MailManager/resources/List.js b/pkg/vtiger/modules/MailManager/layouts/v7/modules/MailManager/resources/List.js
index 97d55852c944ee52efcb794d7b2e675783cde82c..a14977684d69a9c4d22674b295947fc7020c1ec1 100644
--- a/pkg/vtiger/modules/MailManager/layouts/v7/modules/MailManager/resources/List.js
+++ b/pkg/vtiger/modules/MailManager/layouts/v7/modules/MailManager/resources/List.js
@@ -156,17 +156,17 @@ Vtiger_List_Js("MailManager_List_Js", {}, {
 			settingContainer.find('.selectFolderDesc').removeClass('hide');
 			if(useProtocol != '') {
 				settingContainer.find('#_mbox_server').val(useServer);
-				settingContainer.find('.mbox_protocol').each(function(node) {
+				settingContainer.find('.mbox_protocol').each(function(i, node) {
 					if(jQuery(node).val() == useProtocol) {
 						jQuery(node).attr('checked', true);
 					}
 				});
-				settingContainer.find('.mbox_ssltype').each(function(node) {
+				settingContainer.find('.mbox_ssltype').each(function(i, node) {
 					if(jQuery(node).val() == useSSLType) {
 						jQuery(node).attr('checked', true);
 					}
 				});
-				settingContainer.find('.mbox_certvalidate').each(function(node) {
+				settingContainer.find('.mbox_certvalidate').each(function(i, node) {
 					if(jQuery(node).val() == useCert) {
 						jQuery(node).attr('checked', true);
 					}
@@ -1529,4 +1529,4 @@ Vtiger_List_Js("MailManager_List_Js", {}, {
 		self.registerSearchTypeChangeEvent();
 		self.registerPostMailSentEvent();
 	}
-});
\ No newline at end of file
+});
diff --git a/pkg/vtiger/modules/MailManager/modules/MailManager/models/Message.php b/pkg/vtiger/modules/MailManager/modules/MailManager/models/Message.php
index 095a55de8396178d876b98a8b9bb902f56142ba9..cc10a52e91a44166649437b06a3a63050d8931f6 100644
--- a/pkg/vtiger/modules/MailManager/modules/MailManager/models/Message.php
+++ b/pkg/vtiger/modules/MailManager/modules/MailManager/models/Message.php
@@ -247,8 +247,9 @@ class MailManager_Message_Model extends Vtiger_MailRecord  {
 	 * @global Array $upload_badext - List of bad extensions
 	 * @param Boolean $withContent - Used to load the Attachments with/withoud content
 	 * @param String $aName - Attachment Name
+	 * @param Integer $aId - Attachment Id (to eliminate friction with same Attachment Name)
 	 */
-	protected function loadAttachmentsFromDB($withContent, $aName=false) {
+	protected function loadAttachmentsFromDB($withContent, $aName=false, $aId=false) {
 		$db = PearDatabase::getInstance();
 		$currentUserModel = Users_Record_Model::getCurrentUserModel();
 
@@ -260,7 +261,8 @@ class MailManager_Message_Model extends Vtiger_MailRecord  {
 			$filteredColumns = "aname, attachid, path, cid";
 
 			$whereClause = "";
-			if ($aName) { $whereClause = " AND aname=?"; $params[] = $aName; }
+			if ($aName) { $whereClause .= " AND aname=?"; $params[] = $aName; }
+			if ($aId)   { $whereClause .= " AND aid=?"; $params[] = $aId; }
 
 			$atResult = $db->pquery("SELECT {$filteredColumns} FROM vtiger_mailmanager_mailattachments
 						WHERE userid=? AND muid=? $whereClause", $params);
@@ -279,7 +281,7 @@ class MailManager_Message_Model extends Vtiger_MailRecord  {
 					$filePath = $atResultRow['path'].$atResultRow['attachid'].'_'.sanitizeUploadFileName($atResultRow['aname'], vglobal('upload_badext'));
 					$fileSize = $this->convertFileSize(filesize($filePath));
 					$data = ($withContent? $fileContent: false);
-					$this->_attachments[] = array('filename'=>$atResultRow['aname'], 'data' => $data, 'size' => $fileSize, 'path' => $filePath);
+					$this->_attachments[] = array('filename'=>$atResultRow['aname'], 'data' => $data, 'size' => $fileSize, 'path' => $filePath, 'attachid' => $atResultRow['attachid']);
 					unset($fileContent); // Clear immediately
 				}
 
@@ -404,10 +406,11 @@ class MailManager_Message_Model extends Vtiger_MailRecord  {
 	 * Gets the Mail Attachments
 	 * @param Boolean $withContent
 	 * @param String $aName
+	 * @param Integer $aId
 	 * @return List of Attachments
 	 */
-	public function attachments($withContent=true, $aName=false) {
-		$this->loadAttachmentsFromDB($withContent, $aName);
+	public function attachments($withContent=true, $aName=false, $aId=false) {
+		$this->loadAttachmentsFromDB($withContent, $aName, $aId);
 		return $this->_attachments;
 	}
 
@@ -700,4 +703,4 @@ class MailManager_Message_Model extends Vtiger_MailRecord  {
 		return $icon;
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/pkg/vtiger/modules/MailManager/modules/MailManager/third-party/XML/HTMLSax3.php b/pkg/vtiger/modules/MailManager/modules/MailManager/third-party/XML/HTMLSax3.php
index 7cdc4c6abdec4c425c9dc971ceea7d846c1dbf3f..5314404f3f1714e26d38ee6aca448895a467b3da 100644
--- a/pkg/vtiger/modules/MailManager/modules/MailManager/third-party/XML/HTMLSax3.php
+++ b/pkg/vtiger/modules/MailManager/modules/MailManager/third-party/XML/HTMLSax3.php
@@ -21,6 +21,16 @@
 //
 // $Id: HTMLSax3.php,v 1.2 2007/10/29 21:41:34 hfuecks Exp $
 //
+
+/**
+* 2017 02 01 - 1st February 2017
+* Author: Steven B Clarke
+* replace all occurances of function CLASSNAME(...)
+* with __construct(...)
+
+replace all occurances of "=& new CLASSNAME" with "= new CLASSNAME"
+*/
+
 /**
 * Main parser components
 * @package XML_HTMLSax3
@@ -156,17 +166,17 @@ class XML_HTMLSax3_StateParser {
     * @var XML_HTMLSax3 instance of user front end class
     * @access protected
     */
-    function XML_HTMLSax3_StateParser (& $htmlsax) {
-        $this->htmlsax = & $htmlsax;
-        $this->State[XML_HTMLSAX3_STATE_START] =& new XML_HTMLSax3_StartingState();
+    function __construct(& $htmlsax) {
+        $this->htmlsax =& $htmlsax;
+        $this->State[XML_HTMLSAX3_STATE_START] = new XML_HTMLSax3_StartingState();
 
-        $this->State[XML_HTMLSAX3_STATE_CLOSING_TAG] =& new XML_HTMLSax3_ClosingTagState();
-        $this->State[XML_HTMLSAX3_STATE_TAG] =& new XML_HTMLSax3_TagState();
-        $this->State[XML_HTMLSAX3_STATE_OPENING_TAG] =& new XML_HTMLSax3_OpeningTagState();
+        $this->State[XML_HTMLSAX3_STATE_CLOSING_TAG] = new XML_HTMLSax3_ClosingTagState();
+        $this->State[XML_HTMLSAX3_STATE_TAG] = new XML_HTMLSax3_TagState();
+        $this->State[XML_HTMLSAX3_STATE_OPENING_TAG] = new XML_HTMLSax3_OpeningTagState();
 
-        $this->State[XML_HTMLSAX3_STATE_PI] =& new XML_HTMLSax3_PiState();
-        $this->State[XML_HTMLSAX3_STATE_JASP] =& new XML_HTMLSax3_JaspState();
-        $this->State[XML_HTMLSAX3_STATE_ESCAPE] =& new XML_HTMLSax3_EscapeState();
+        $this->State[XML_HTMLSAX3_STATE_PI] = new XML_HTMLSax3_PiState();
+        $this->State[XML_HTMLSAX3_STATE_JASP] = new XML_HTMLSax3_JaspState();
+        $this->State[XML_HTMLSAX3_STATE_ESCAPE] = new XML_HTMLSax3_EscapeState();
     }
 
     /**
@@ -241,14 +251,14 @@ class XML_HTMLSax3_StateParser {
     */
     function parse($data) {
         if ($this->parser_options['XML_OPTION_TRIM_DATA_NODES']==1) {
-            $decorator =& new XML_HTMLSax3_Trim(
+            $decorator = new XML_HTMLSax3_Trim(
                 $this->handler_object_data,
                 $this->handler_method_data);
             $this->handler_object_data =& $decorator;
             $this->handler_method_data = 'trimData';
         }
         if ($this->parser_options['XML_OPTION_CASE_FOLDING']==1) {
-            $open_decor =& new XML_HTMLSax3_CaseFolding(
+            $open_decor = new XML_HTMLSax3_CaseFolding(
                 $this->handler_object_element,
                 $this->handler_method_opening,
                 $this->handler_method_closing);
@@ -257,28 +267,28 @@ class XML_HTMLSax3_StateParser {
             $this->handler_method_closing ='foldClose';
         }
         if ($this->parser_options['XML_OPTION_LINEFEED_BREAK']==1) {
-            $decorator =& new XML_HTMLSax3_Linefeed(
+            $decorator = new XML_HTMLSax3_Linefeed(
                 $this->handler_object_data,
                 $this->handler_method_data);
             $this->handler_object_data =& $decorator;
             $this->handler_method_data = 'breakData';
         }
         if ($this->parser_options['XML_OPTION_TAB_BREAK']==1) {
-            $decorator =& new XML_HTMLSax3_Tab(
+            $decorator = new XML_HTMLSax3_Tab(
                 $this->handler_object_data,
                 $this->handler_method_data);
             $this->handler_object_data =& $decorator;
             $this->handler_method_data = 'breakData';
         }
         if ($this->parser_options['XML_OPTION_ENTITIES_UNPARSED']==1) {
-            $decorator =& new XML_HTMLSax3_Entities_Unparsed(
+            $decorator = new XML_HTMLSax3_Entities_Unparsed(
                 $this->handler_object_data,
                 $this->handler_method_data);
             $this->handler_object_data =& $decorator;
             $this->handler_method_data = 'breakData';
         }
         if ($this->parser_options['XML_OPTION_ENTITIES_PARSED']==1) {
-            $decorator =& new XML_HTMLSax3_Entities_Parsed(
+            $decorator = new XML_HTMLSax3_Entities_Parsed(
                 $this->handler_object_data,
                 $this->handler_method_data);
             $this->handler_object_data =& $decorator;
@@ -286,7 +296,7 @@ class XML_HTMLSax3_StateParser {
         }
         // Note switched on by default
         if ($this->parser_options['XML_OPTION_STRIP_ESCAPES']==1) {
-            $decorator =& new XML_HTMLSax3_Escape_Stripper(
+            $decorator = new XML_HTMLSax3_Escape_Stripper(
                 $this->handler_object_escape,
                 $this->handler_method_escape);
             $this->handler_object_escape =& $decorator;
@@ -327,8 +337,8 @@ class XML_HTMLSax3_StateParser_Lt430 extends XML_HTMLSax3_StateParser {
     * @var XML_HTMLSax3 instance of user front end class
     * @access protected
     */
-    function XML_HTMLSax3_StateParser_Lt430(& $htmlsax) {
-        parent::XML_HTMLSax3_StateParser($htmlsax);
+    function __construct(& $htmlsax) {
+        parent::__construct($htmlsax);
         $this->parser_options['XML_OPTION_TRIM_DATA_NODES'] = 0;
         $this->parser_options['XML_OPTION_CASE_FOLDING'] = 0;
         $this->parser_options['XML_OPTION_LINEFEED_BREAK'] = 0;
@@ -359,7 +369,7 @@ class XML_HTMLSax3_StateParser_Lt430 extends XML_HTMLSax3_StateParser {
     * @return void
     */
     function ignoreWhitespace() {
-        while ($this->position < $this->length &&
+        while ($this->position < $this->length && 
             strpos(" \n\r\t", $this->rawtext{$this->position}) !== FALSE) {
             $this->position++;
         }
@@ -391,8 +401,8 @@ class XML_HTMLSax3_StateParser_Gtet430 extends XML_HTMLSax3_StateParser {
     * @var XML_HTMLSax3 instance of user front end class
     * @access protected
     */
-    function XML_HTMLSax3_StateParser_Gtet430(& $htmlsax) {
-        parent::XML_HTMLSax3_StateParser($htmlsax);
+    function __construct(& $htmlsax) {
+        parent::__construct($htmlsax);
         $this->parser_options['XML_OPTION_TRIM_DATA_NODES'] = 0;
         $this->parser_options['XML_OPTION_CASE_FOLDING'] = 0;
         $this->parser_options['XML_OPTION_LINEFEED_BREAK'] = 0;
@@ -481,13 +491,13 @@ class XML_HTMLSax3 {
     * </pre>
     * @access public
     */
-    function XML_HTMLSax3() {
+    function __construct() {
         if (version_compare(phpversion(), '4.3', 'ge')) {
-            $this->state_parser =& new XML_HTMLSax3_StateParser_Gtet430($this);
+            $this->state_parser = new XML_HTMLSax3_StateParser_Gtet430($this);
         } else {
-            $this->state_parser =& new XML_HTMLSax3_StateParser_Lt430($this);
+            $this->state_parser = new XML_HTMLSax3_StateParser_Lt430($this);
         }
-        $nullhandler =& new XML_HTMLSax3_NullHandler();
+        $nullhandler = new XML_HTMLSax3_NullHandler();
         $this->set_object($nullhandler);
         $this->set_element_handler('DoNothing', 'DoNothing');
         $this->set_data_handler('DoNothing');
@@ -528,7 +538,7 @@ class XML_HTMLSax3 {
     * <li>XML_OPTION_ENTITIES_UNPARSED: XML entities are returned as
     * seperate data handler calls in unparsed form</li>
     * <li>XML_OPTION_ENTITIES_PARSED: (PHP 4.3.0+ only) XML entities are
-    * returned as seperate data handler calls and are parsed with
+    * returned as seperate data handler calls and are parsed with 
     * PHP's html_entity_decode() function</li>
     * <li>XML_OPTION_STRIP_ESCAPES: strips out the -- -- comment markers
     * or CDATA markup inside an XML escape, if found.</li>
@@ -684,4 +694,4 @@ class XML_HTMLSax3 {
         $this->state_parser->parse($data);
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/pkg/vtiger/modules/MailManager/modules/MailManager/third-party/XML/HTMLSax3/Decorators.php b/pkg/vtiger/modules/MailManager/modules/MailManager/third-party/XML/HTMLSax3/Decorators.php
index 156d709b48ad545a32862f8eb335811bc857f412..8a79c7b137e34103cdc727eeab4fb968babdf5d5 100644
--- a/pkg/vtiger/modules/MailManager/modules/MailManager/third-party/XML/HTMLSax3/Decorators.php
+++ b/pkg/vtiger/modules/MailManager/modules/MailManager/third-party/XML/HTMLSax3/Decorators.php
@@ -21,6 +21,15 @@
 //
 // $Id: Decorators.php,v 1.2 2007/10/29 21:41:35 hfuecks Exp $
 //
+
+/*
+ * 2017 02 01 - 1st February 2017
+ * Author: Steven B Clarke
+ * replace all occurances of function CLASSNAME(...)
+ * with __construct(...)
+*/
+
+
 /**
 * Decorators for dealing with parser options
 * @package XML_HTMLSax3
@@ -45,13 +54,14 @@ class XML_HTMLSax3_Trim {
     * @access private
     */
     var $orig_method;
+
     /**
     * Constructs XML_HTMLSax3_Trim
     * @param object handler object being decorated
     * @param string original handler method
     * @access protected
     */
-    function XML_HTMLSax3_Trim(&$orig_obj, $orig_method) {
+    function __construct(&$orig_obj, $orig_method) {
         $this->orig_obj =& $orig_obj;
         $this->orig_method = $orig_method;
     }
@@ -99,7 +109,7 @@ class XML_HTMLSax3_CaseFolding {
     * @param string original close handler method
     * @access protected
     */
-    function XML_HTMLSax3_CaseFolding(&$orig_obj, $orig_open_method, $orig_close_method) {
+    function __construct(&$orig_obj, $orig_open_method, $orig_close_method) {
         $this->orig_obj =& $orig_obj;
         $this->orig_open_method = $orig_open_method;
         $this->orig_close_method = $orig_close_method;
@@ -149,7 +159,7 @@ class XML_HTMLSax3_Linefeed {
     * @param string original handler method
     * @access protected
     */
-    function XML_HTMLSax3_LineFeed(&$orig_obj, $orig_method) {
+    function __construct(&$orig_obj, $orig_method) {
         $this->orig_obj =& $orig_obj;
         $this->orig_method = $orig_method;
     }
@@ -191,7 +201,7 @@ class XML_HTMLSax3_Tab {
     * @param string original handler method
     * @access protected
     */
-    function XML_HTMLSax3_Tab(&$orig_obj, $orig_method) {
+    function __construct(&$orig_obj, $orig_method) {
         $this->orig_obj =& $orig_obj;
         $this->orig_method = $orig_method;
     }
@@ -234,7 +244,7 @@ class XML_HTMLSax3_Entities_Parsed {
     * @param string original handler method
     * @access protected
     */
-    function XML_HTMLSax3_Entities_Parsed(&$orig_obj, $orig_method) {
+    function __construct(&$orig_obj, $orig_method) {
         $this->orig_obj =& $orig_obj;
         $this->orig_method = $orig_method;
     }
@@ -286,7 +296,7 @@ class XML_HTMLSax3_Entities_Unparsed {
     * @param string original handler method
     * @access protected
     */
-    function XML_HTMLSax3_Entities_Unparsed(&$orig_obj, $orig_method) {
+    function __construct(&$orig_obj, $orig_method) {
         $this->orig_obj =& $orig_obj;
         $this->orig_method = $orig_method;
     }
@@ -329,7 +339,7 @@ class XML_HTMLSax3_Escape_Stripper {
     * @param string original handler method
     * @access protected
     */
-    function XML_HTMLSax3_Escape_Stripper(&$orig_obj, $orig_method) {
+    function __construct(&$orig_obj, $orig_method) {
         $this->orig_obj =& $orig_obj;
         $this->orig_method = $orig_method;
     }
@@ -360,4 +370,4 @@ class XML_HTMLSax3_Escape_Stripper {
         $this->orig_obj->{$this->orig_method}($this, $data);
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/pkg/vtiger/modules/MailManager/modules/MailManager/third-party/XML/HTMLSax3/States.php b/pkg/vtiger/modules/MailManager/modules/MailManager/third-party/XML/HTMLSax3/States.php
index b92b7b27174f9970c121867dcd6a75390f93503c..c9ef28e97053f63966e2dcb18fbbcad806346abc 100644
--- a/pkg/vtiger/modules/MailManager/modules/MailManager/third-party/XML/HTMLSax3/States.php
+++ b/pkg/vtiger/modules/MailManager/modules/MailManager/third-party/XML/HTMLSax3/States.php
@@ -132,7 +132,7 @@ class XML_HTMLSax3_OpeningTagState {
     */
     function parseAttributes(&$context) {
         $Attributes = array();
-
+    
         $context->ignoreWhitespace();
         $attributename = $context->scanUntilCharacters("=/> \n\r\t");
         while ($attributename != '') {
@@ -158,7 +158,7 @@ class XML_HTMLSax3_OpeningTagState {
                 $context->unscanCharacter();
             }
             $Attributes[$attributename] = $attributevalue;
-
+            
             $context->ignoreWhitespace();
             $attributename = $context->scanUntilCharacters("=/> \n\r\t");
         }
@@ -182,14 +182,14 @@ class XML_HTMLSax3_OpeningTagState {
                     $context->unscanCharacter();
                 }
                 $context->handler_object_element->
-                    {$context->handler_method_opening}($context->htmlsax, $tag,
+                    {$context->handler_method_opening}($context->htmlsax, $tag, 
                     $Attributes, TRUE);
                 $context->handler_object_element->
-                    {$context->handler_method_closing}($context->htmlsax, $tag,
+                    {$context->handler_method_closing}($context->htmlsax, $tag, 
                     TRUE);
             } else {
                 $context->handler_object_element->
-                    {$context->handler_method_opening}($context->htmlsax, $tag,
+                    {$context->handler_method_opening}($context->htmlsax, $tag, 
                     $Attributes, FALSE);
             }
         }
diff --git a/pkg/vtiger/modules/MailManager/modules/MailManager/third-party/XML/Util.php b/pkg/vtiger/modules/MailManager/modules/MailManager/third-party/XML/Util.php
new file mode 100644
index 0000000000000000000000000000000000000000..69caf24caf8f8ce08899b19ed56d977c64f0707a
--- /dev/null
+++ b/pkg/vtiger/modules/MailManager/modules/MailManager/third-party/XML/Util.php
@@ -0,0 +1,927 @@
+<?php
+/**
+ * XML_Util
+ *
+ * XML Utilities package
+ *
+ * PHP versions 4 and 5
+ *
+ *********************************
+ * 2017 02 01 - 1st February 2017
+ * author: Steven B Clarke
+ * check for compatibility with
+ * PHP version 7.0.6
+ *********************************
+ * LICENSE:
+ *
+ * Copyright (c) 2003-2008 Stephan Schmidt <schst@php.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * The name of the author may not be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category  XML
+ * @package   XML_Util
+ * @author    Stephan Schmidt <schst@php.net>
+ * @copyright 2003-2008 Stephan Schmidt <schst@php.net>
+ * @license   http://opensource.org/licenses/bsd-license New BSD License
+ * @version   CVS: $Id$
+ * @link      http://pear.php.net/package/XML_Util
+ */
+
+/**
+ * Error code for invalid chars in XML name
+ */
+define('XML_UTIL_ERROR_INVALID_CHARS', 51);
+
+/**
+ * Error code for invalid chars in XML name
+ */
+define('XML_UTIL_ERROR_INVALID_START', 52);
+
+/**
+ * Error code for non-scalar tag content
+ */
+define('XML_UTIL_ERROR_NON_SCALAR_CONTENT', 60);
+
+/**
+ * Error code for missing tag name
+ */
+define('XML_UTIL_ERROR_NO_TAG_NAME', 61);
+
+/**
+ * Replace XML entities
+ */
+define('XML_UTIL_REPLACE_ENTITIES', 1);
+
+/**
+ * Embedd content in a CData Section
+ */
+define('XML_UTIL_CDATA_SECTION', 5);
+
+/**
+ * Do not replace entitites
+ */
+define('XML_UTIL_ENTITIES_NONE', 0);
+
+/**
+ * Replace all XML entitites
+ * This setting will replace <, >, ", ' and &
+ */
+define('XML_UTIL_ENTITIES_XML', 1);
+
+/**
+ * Replace only required XML entitites
+ * This setting will replace <, " and &
+ */
+define('XML_UTIL_ENTITIES_XML_REQUIRED', 2);
+
+/**
+ * Replace HTML entitites
+ * @link http://www.php.net/htmlentities
+ */
+define('XML_UTIL_ENTITIES_HTML', 3);
+
+/**
+ * Collapse all empty tags.
+ */
+define('XML_UTIL_COLLAPSE_ALL', 1);
+
+/**
+ * Collapse only empty XHTML tags that have no end tag.
+ */
+define('XML_UTIL_COLLAPSE_XHTML_ONLY', 2);
+
+/**
+ * Utility class for working with XML documents
+ *
+ * @category  XML
+ * @package   XML_Util
+ * @author    Stephan Schmidt <schst@php.net>
+ * @copyright 2003-2008 Stephan Schmidt <schst@php.net>
+ * @license   http://opensource.org/licenses/bsd-license New BSD License
+ * @version   Release: 1.3.0
+ * @link      http://pear.php.net/package/XML_Util
+ */
+class XML_Util
+{
+    /**
+     * Return API version
+     *
+     * @return string $version API version
+     */
+    public static function apiVersion()
+    {
+        return '1.1';
+    }
+
+    /**
+     * Replace XML entities
+     *
+     * With the optional second parameter, you may select, which
+     * entities should be replaced.
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // replace XML entites:
+     * $string = XML_Util::replaceEntities('This string contains < & >.');
+     * </code>
+     *
+     * With the optional third parameter, you may pass the character encoding
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // replace XML entites in UTF-8:
+     * $string = XML_Util::replaceEntities(
+     *     'This string contains < & > as well as ä, ö, ß, à and ê',
+     *     XML_UTIL_ENTITIES_HTML,
+     *     'UTF-8'
+     * );
+     * </code>
+     *
+     * @param string $string          string where XML special chars
+     *                                should be replaced
+     * @param int    $replaceEntities setting for entities in attribute values
+     *                                (one of XML_UTIL_ENTITIES_XML,
+     *                                XML_UTIL_ENTITIES_XML_REQUIRED,
+     *                                XML_UTIL_ENTITIES_HTML)
+     * @param string $encoding        encoding value (if any)...
+     *                                must be a valid encoding as determined
+     *                                by the htmlentities() function
+     *
+     * @return string string with replaced chars
+     * @see    reverseEntities()
+     */
+    public static function replaceEntities(
+        $string, $replaceEntities = XML_UTIL_ENTITIES_XML, $encoding = 'ISO-8859-1'
+    ) {
+        switch ($replaceEntities) {
+        case XML_UTIL_ENTITIES_XML:
+            return strtr(
+                $string,
+                array(
+                    '&'  => '&amp;',
+                    '>'  => '&gt;',
+                    '<'  => '&lt;',
+                    '"'  => '&quot;',
+                    '\'' => '&apos;'
+                )
+            );
+            break;
+        case XML_UTIL_ENTITIES_XML_REQUIRED:
+            return strtr(
+                $string,
+                array(
+                    '&' => '&amp;',
+                    '<' => '&lt;',
+                    '"' => '&quot;'
+                )
+            );
+            break;
+        case XML_UTIL_ENTITIES_HTML:
+            return htmlentities($string, ENT_COMPAT, $encoding);
+            break;
+        }
+        return $string;
+    }
+
+    /**
+     * Reverse XML entities
+     *
+     * With the optional second parameter, you may select, which
+     * entities should be reversed.
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // reverse XML entites:
+     * $string = XML_Util::reverseEntities('This string contains &lt; &amp; &gt;.');
+     * </code>
+     *
+     * With the optional third parameter, you may pass the character encoding
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // reverse XML entites in UTF-8:
+     * $string = XML_Util::reverseEntities(
+     *     'This string contains &lt; &amp; &gt; as well as'
+     *     . ' &auml;, &ouml;, &szlig;, &agrave; and &ecirc;',
+     *     XML_UTIL_ENTITIES_HTML,
+     *     'UTF-8'
+     * );
+     * </code>
+     *
+     * @param string $string          string where XML special chars
+     *                                should be replaced
+     * @param int    $replaceEntities setting for entities in attribute values
+     *                                (one of XML_UTIL_ENTITIES_XML,
+     *                                XML_UTIL_ENTITIES_XML_REQUIRED,
+     *                                XML_UTIL_ENTITIES_HTML)
+     * @param string $encoding        encoding value (if any)...
+     *                                must be a valid encoding as determined
+     *                                by the html_entity_decode() function
+     *
+     * @return string string with replaced chars
+     * @see    replaceEntities()
+     */
+    public static function reverseEntities(
+        $string, $replaceEntities = XML_UTIL_ENTITIES_XML, $encoding = 'ISO-8859-1'
+    ) {
+        switch ($replaceEntities) {
+        case XML_UTIL_ENTITIES_XML:
+            return strtr(
+                $string,
+                array(
+                    '&amp;'  => '&',
+                    '&gt;'   => '>',
+                    '&lt;'   => '<',
+                    '&quot;' => '"',
+                    '&apos;' => '\''
+                )
+            );
+            break;
+        case XML_UTIL_ENTITIES_XML_REQUIRED:
+            return strtr(
+                $string,
+                array(
+                    '&amp;'  => '&',
+                    '&lt;'   => '<',
+                    '&quot;' => '"'
+                )
+            );
+            break;
+        case XML_UTIL_ENTITIES_HTML:
+            return html_entity_decode($string, ENT_COMPAT, $encoding);
+            break;
+        }
+        return $string;
+    }
+
+    /**
+     * Build an xml declaration
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // get an XML declaration:
+     * $xmlDecl = XML_Util::getXMLDeclaration('1.0', 'UTF-8', true);
+     * </code>
+     *
+     * @param string $version    xml version
+     * @param string $encoding   character encoding
+     * @param bool   $standalone document is standalone (or not)
+     *
+     * @return string xml declaration
+     * @uses   attributesToString() to serialize the attributes of the
+     *         XML declaration
+     */
+    public static function getXMLDeclaration(
+        $version = '1.0', $encoding = null, $standalone = null
+    ) {
+        $attributes = array(
+            'version' => $version,
+        );
+        // add encoding
+        if ($encoding !== null) {
+            $attributes['encoding'] = $encoding;
+        }
+        // add standalone, if specified
+        if ($standalone !== null) {
+            $attributes['standalone'] = $standalone ? 'yes' : 'no';
+        }
+
+        return sprintf(
+            '<?xml%s?>',
+            XML_Util::attributesToString($attributes, false)
+        );
+    }
+
+    /**
+     * Build a document type declaration
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // get a doctype declaration:
+     * $xmlDecl = XML_Util::getDocTypeDeclaration('rootTag','myDocType.dtd');
+     * </code>
+     *
+     * @param string $root        name of the root tag
+     * @param string $uri         uri of the doctype definition
+     *                            (or array with uri and public id)
+     * @param string $internalDtd internal dtd entries
+     *
+     * @return string doctype declaration
+     * @since  0.2
+     */
+    public static function getDocTypeDeclaration(
+        $root, $uri = null, $internalDtd = null
+    ) {
+        if (is_array($uri)) {
+            $ref = sprintf(' PUBLIC "%s" "%s"', $uri['id'], $uri['uri']);
+        } elseif (!empty($uri)) {
+            $ref = sprintf(' SYSTEM "%s"', $uri);
+        } else {
+            $ref = '';
+        }
+
+        if (empty($internalDtd)) {
+            return sprintf('<!DOCTYPE %s%s>', $root, $ref);
+        } else {
+            return sprintf("<!DOCTYPE %s%s [\n%s\n]>", $root, $ref, $internalDtd);
+        }
+    }
+
+    /**
+     * Create string representation of an attribute list
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // build an attribute string
+     * $att = array(
+     *              'foo'   =>  'bar',
+     *              'argh'  =>  'tomato'
+     *            );
+     *
+     * $attList = XML_Util::attributesToString($att);
+     * </code>
+     *
+     * @param array      $attributes attribute array
+     * @param bool|array $sort       sort attribute list alphabetically,
+     *                               may also be an assoc array containing
+     *                               the keys 'sort', 'multiline', 'indent',
+     *                               'linebreak' and 'entities'
+     * @param bool       $multiline  use linebreaks, if more than
+     *                               one attribute is given
+     * @param string     $indent     string used for indentation of
+     *                               multiline attributes
+     * @param string     $linebreak  string used for linebreaks of
+     *                               multiline attributes
+     * @param int        $entities   setting for entities in attribute values
+     *                               (one of XML_UTIL_ENTITIES_NONE,
+     *                               XML_UTIL_ENTITIES_XML,
+     *                               XML_UTIL_ENTITIES_XML_REQUIRED,
+     *                               XML_UTIL_ENTITIES_HTML)
+     *
+     * @return string string representation of the attributes
+     * @uses   replaceEntities() to replace XML entities in attribute values
+     * @todo   allow sort also to be an options array
+     */
+    public static function attributesToString(
+        $attributes, $sort = true, $multiline = false,
+        $indent = '    ', $linebreak = "\n", $entities = XML_UTIL_ENTITIES_XML
+    ) {
+        /*
+         * second parameter may be an array
+         */
+        if (is_array($sort)) {
+            if (isset($sort['multiline'])) {
+                $multiline = $sort['multiline'];
+            }
+            if (isset($sort['indent'])) {
+                $indent = $sort['indent'];
+            }
+            if (isset($sort['linebreak'])) {
+                $multiline = $sort['linebreak'];
+            }
+            if (isset($sort['entities'])) {
+                $entities = $sort['entities'];
+            }
+            if (isset($sort['sort'])) {
+                $sort = $sort['sort'];
+            } else {
+                $sort = true;
+            }
+        }
+        $string = '';
+        if (is_array($attributes) && !empty($attributes)) {
+            if ($sort) {
+                ksort($attributes);
+            }
+            if (!$multiline || count($attributes) == 1) {
+                foreach ($attributes as $key => $value) {
+                    if ($entities != XML_UTIL_ENTITIES_NONE) {
+                        if ($entities === XML_UTIL_CDATA_SECTION) {
+                            $entities = XML_UTIL_ENTITIES_XML;
+                        }
+                        $value = XML_Util::replaceEntities($value, $entities);
+                    }
+                    $string .= ' ' . $key . '="' . $value . '"';
+                }
+            } else {
+                $first = true;
+                foreach ($attributes as $key => $value) {
+                    if ($entities != XML_UTIL_ENTITIES_NONE) {
+                        $value = XML_Util::replaceEntities($value, $entities);
+                    }
+                    if ($first) {
+                        $string .= ' ' . $key . '="' . $value . '"';
+                        $first   = false;
+                    } else {
+                        $string .= $linebreak . $indent . $key . '="' . $value . '"';
+                    }
+                }
+            }
+        }
+        return $string;
+    }
+
+    /**
+     * Collapses empty tags.
+     *
+     * @param string $xml  XML
+     * @param int    $mode Whether to collapse all empty tags (XML_UTIL_COLLAPSE_ALL)
+     *                      or only XHTML (XML_UTIL_COLLAPSE_XHTML_ONLY) ones.
+     *
+     * @return string XML
+     */
+    public static function collapseEmptyTags($xml, $mode = XML_UTIL_COLLAPSE_ALL)
+    {
+        if ($mode == XML_UTIL_COLLAPSE_XHTML_ONLY) {
+            return preg_replace(
+                '/<(area|base(?:font)?|br|col|frame|hr|img|input|isindex|link|meta|'
+                . 'param)([^>]*)><\/\\1>/s',
+                '<\\1\\2 />',
+                $xml
+            );
+        } else {
+            return preg_replace('/<(\w+)([^>]*)><\/\\1>/s', '<\\1\\2 />', $xml);
+        }
+    }
+
+    /**
+     * Create a tag
+     *
+     * This method will call XML_Util::createTagFromArray(), which
+     * is more flexible.
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // create an XML tag:
+     * $tag = XML_Util::createTag('myNs:myTag',
+     *     array('foo' => 'bar'),
+     *     'This is inside the tag',
+     *     'http://www.w3c.org/myNs#');
+     * </code>
+     *
+     * @param string $qname           qualified tagname (including namespace)
+     * @param array  $attributes      array containg attributes
+     * @param mixed  $content         the content
+     * @param string $namespaceUri    URI of the namespace
+     * @param int    $replaceEntities whether to replace XML special chars in
+     *                                content, embedd it in a CData section
+     *                                or none of both
+     * @param bool   $multiline       whether to create a multiline tag where
+     *                                each attribute gets written to a single line
+     * @param string $indent          string used to indent attributes
+     *                                (_auto indents attributes so they start
+     *                                at the same column)
+     * @param string $linebreak       string used for linebreaks
+     * @param bool   $sortAttributes  Whether to sort the attributes or not
+     *
+     * @return string XML tag
+     * @see    createTagFromArray()
+     * @uses   createTagFromArray() to create the tag
+     */
+    public static function createTag(
+        $qname, $attributes = array(), $content = null,
+        $namespaceUri = null, $replaceEntities = XML_UTIL_REPLACE_ENTITIES,
+        $multiline = false, $indent = '_auto', $linebreak = "\n",
+        $sortAttributes = true
+    ) {
+        $tag = array(
+            'qname'      => $qname,
+            'attributes' => $attributes
+        );
+
+        // add tag content
+        if ($content !== null) {
+            $tag['content'] = $content;
+        }
+
+        // add namespace Uri
+        if ($namespaceUri !== null) {
+            $tag['namespaceUri'] = $namespaceUri;
+        }
+
+        return XML_Util::createTagFromArray(
+            $tag, $replaceEntities, $multiline,
+            $indent, $linebreak, $sortAttributes
+        );
+    }
+
+    /**
+     * Create a tag from an array.
+     * This method awaits an array in the following format
+     * <pre>
+     * array(
+     *     // qualified name of the tag
+     *     'qname' => $qname
+     *
+     *     // namespace prefix (optional, if qname is specified or no namespace)
+     *     'namespace' => $namespace
+     *
+     *     // local part of the tagname (optional, if qname is specified)
+     *     'localpart' => $localpart,
+     *
+     *     // array containing all attributes (optional)
+     *     'attributes' => array(),
+     *
+     *     // tag content (optional)
+     *     'content' => $content,
+     *
+     *     // namespaceUri for the given namespace (optional)
+     *     'namespaceUri' => $namespaceUri
+     * )
+     * </pre>
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * $tag = array(
+     *     'qname'        => 'foo:bar',
+     *     'namespaceUri' => 'http://foo.com',
+     *     'attributes'   => array('key' => 'value', 'argh' => 'fruit&vegetable'),
+     *     'content'      => 'I\'m inside the tag',
+     * );
+     * // creating a tag with qualified name and namespaceUri
+     * $string = XML_Util::createTagFromArray($tag);
+     * </code>
+     *
+     * @param array  $tag             tag definition
+     * @param int    $replaceEntities whether to replace XML special chars in
+     *                                content, embedd it in a CData section
+     *                                or none of both
+     * @param bool   $multiline       whether to create a multiline tag where each
+     *                                attribute gets written to a single line
+     * @param string $indent          string used to indent attributes
+     *                                (_auto indents attributes so they start
+     *                                at the same column)
+     * @param string $linebreak       string used for linebreaks
+     * @param bool   $sortAttributes  Whether to sort the attributes or not
+     *
+     * @return string XML tag
+     *
+     * @see  createTag()
+     * @uses attributesToString() to serialize the attributes of the tag
+     * @uses splitQualifiedName() to get local part and namespace of a qualified name
+     * @uses createCDataSection()
+     * @uses raiseError()
+     */
+    public static function createTagFromArray(
+        $tag, $replaceEntities = XML_UTIL_REPLACE_ENTITIES,
+        $multiline = false, $indent = '_auto', $linebreak = "\n",
+        $sortAttributes = true
+    ) {
+        if (isset($tag['content']) && !is_scalar($tag['content'])) {
+            return XML_Util::raiseError(
+                'Supplied non-scalar value as tag content',
+                XML_UTIL_ERROR_NON_SCALAR_CONTENT
+            );
+        }
+
+        if (!isset($tag['qname']) && !isset($tag['localPart'])) {
+            return XML_Util::raiseError(
+                'You must either supply a qualified name '
+                . '(qname) or local tag name (localPart).',
+                XML_UTIL_ERROR_NO_TAG_NAME
+            );
+        }
+
+        // if no attributes hav been set, use empty attributes
+        if (!isset($tag['attributes']) || !is_array($tag['attributes'])) {
+            $tag['attributes'] = array();
+        }
+
+        if (isset($tag['namespaces'])) {
+            foreach ($tag['namespaces'] as $ns => $uri) {
+                $tag['attributes']['xmlns:' . $ns] = $uri;
+            }
+        }
+
+        if (!isset($tag['qname'])) {
+            // qualified name is not given
+
+            // check for namespace
+            if (isset($tag['namespace']) && !empty($tag['namespace'])) {
+                $tag['qname'] = $tag['namespace'] . ':' . $tag['localPart'];
+            } else {
+                $tag['qname'] = $tag['localPart'];
+            }
+        } elseif (isset($tag['namespaceUri']) && !isset($tag['namespace'])) {
+            // namespace URI is set, but no namespace
+
+            $parts = XML_Util::splitQualifiedName($tag['qname']);
+
+            $tag['localPart'] = $parts['localPart'];
+            if (isset($parts['namespace'])) {
+                $tag['namespace'] = $parts['namespace'];
+            }
+        }
+
+        if (isset($tag['namespaceUri']) && !empty($tag['namespaceUri'])) {
+            // is a namespace given
+            if (isset($tag['namespace']) && !empty($tag['namespace'])) {
+                $tag['attributes']['xmlns:' . $tag['namespace']]
+                    = $tag['namespaceUri'];
+            } else {
+                // define this Uri as the default namespace
+                $tag['attributes']['xmlns'] = $tag['namespaceUri'];
+            }
+        }
+
+        // check for multiline attributes
+        if ($multiline === true) {
+            if ($indent === '_auto') {
+                $indent = str_repeat(' ', (strlen($tag['qname'])+2));
+            }
+        }
+
+        // create attribute list
+        $attList = XML_Util::attributesToString(
+            $tag['attributes'],
+            $sortAttributes, $multiline, $indent, $linebreak
+        );
+        if (!isset($tag['content']) || (string)$tag['content'] == '') {
+            $tag = sprintf('<%s%s />', $tag['qname'], $attList);
+        } else {
+            switch ($replaceEntities) {
+            case XML_UTIL_ENTITIES_NONE:
+                break;
+            case XML_UTIL_CDATA_SECTION:
+                $tag['content'] = XML_Util::createCDataSection($tag['content']);
+                break;
+            default:
+                $tag['content'] = XML_Util::replaceEntities(
+                    $tag['content'], $replaceEntities
+                );
+                break;
+            }
+            $tag = sprintf(
+                '<%s%s>%s</%s>', $tag['qname'], $attList, $tag['content'],
+                $tag['qname']
+            );
+        }
+        return $tag;
+    }
+
+    /**
+     * Create a start element
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // create an XML start element:
+     * $tag = XML_Util::createStartElement('myNs:myTag',
+     *     array('foo' => 'bar') ,'http://www.w3c.org/myNs#');
+     * </code>
+     *
+     * @param string $qname          qualified tagname (including namespace)
+     * @param array  $attributes     array containg attributes
+     * @param string $namespaceUri   URI of the namespace
+     * @param bool   $multiline      whether to create a multiline tag where each
+     *                               attribute gets written to a single line
+     * @param string $indent         string used to indent attributes (_auto indents
+     *                               attributes so they start at the same column)
+     * @param string $linebreak      string used for linebreaks
+     * @param bool   $sortAttributes Whether to sort the attributes or not
+     *
+     * @return string XML start element
+     * @see    createEndElement(), createTag()
+     */
+    public static function createStartElement(
+        $qname, $attributes = array(), $namespaceUri = null,
+        $multiline = false, $indent = '_auto', $linebreak = "\n",
+        $sortAttributes = true
+    ) {
+        // if no attributes hav been set, use empty attributes
+        if (!isset($attributes) || !is_array($attributes)) {
+            $attributes = array();
+        }
+
+        if ($namespaceUri != null) {
+            $parts = XML_Util::splitQualifiedName($qname);
+        }
+
+        // check for multiline attributes
+        if ($multiline === true) {
+            if ($indent === '_auto') {
+                $indent = str_repeat(' ', (strlen($qname)+2));
+            }
+        }
+
+        if ($namespaceUri != null) {
+            // is a namespace given
+            if (isset($parts['namespace']) && !empty($parts['namespace'])) {
+                $attributes['xmlns:' . $parts['namespace']] = $namespaceUri;
+            } else {
+                // define this Uri as the default namespace
+                $attributes['xmlns'] = $namespaceUri;
+            }
+        }
+
+        // create attribute list
+        $attList = XML_Util::attributesToString(
+            $attributes, $sortAttributes,
+            $multiline, $indent, $linebreak
+        );
+        $element = sprintf('<%s%s>', $qname, $attList);
+        return  $element;
+    }
+
+    /**
+     * Create an end element
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // create an XML start element:
+     * $tag = XML_Util::createEndElement('myNs:myTag');
+     * </code>
+     *
+     * @param string $qname qualified tagname (including namespace)
+     *
+     * @return string XML end element
+     * @see    createStartElement(), createTag()
+     */
+    public static function createEndElement($qname)
+    {
+        $element = sprintf('</%s>', $qname);
+        return $element;
+    }
+
+    /**
+     * Create an XML comment
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // create an XML start element:
+     * $tag = XML_Util::createComment('I am a comment');
+     * </code>
+     *
+     * @param string $content content of the comment
+     *
+     * @return string XML comment
+     */
+    public static function createComment($content)
+    {
+        $comment = sprintf('<!-- %s -->', $content);
+        return $comment;
+    }
+
+    /**
+     * Create a CData section
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // create a CData section
+     * $tag = XML_Util::createCDataSection('I am content.');
+     * </code>
+     *
+     * @param string $data data of the CData section
+     *
+     * @return string CData section with content
+     */
+    public static function createCDataSection($data)
+    {
+        return sprintf(
+            '<![CDATA[%s]]>',
+            preg_replace('/\]\]>/', ']]]]><![CDATA[>', strval($data))
+        );
+    }
+
+    /**
+     * Split qualified name and return namespace and local part
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // split qualified tag
+     * $parts = XML_Util::splitQualifiedName('xslt:stylesheet');
+     * </code>
+     * the returned array will contain two elements:
+     * <pre>
+     * array(
+     *     'namespace' => 'xslt',
+     *     'localPart' => 'stylesheet'
+     * );
+     * </pre>
+     *
+     * @param string $qname     qualified tag name
+     * @param string $defaultNs default namespace (optional)
+     *
+     * @return array array containing namespace and local part
+     */
+    public static function splitQualifiedName($qname, $defaultNs = null)
+    {
+        if (strstr($qname, ':')) {
+            $tmp = explode(':', $qname);
+            return array(
+                'namespace' => $tmp[0],
+                'localPart' => $tmp[1]
+            );
+        }
+        return array(
+            'namespace' => $defaultNs,
+            'localPart' => $qname
+        );
+    }
+
+    /**
+     * Check, whether string is valid XML name
+     *
+     * <p>XML names are used for tagname, attribute names and various
+     * other, lesser known entities.</p>
+     * <p>An XML name may only consist of alphanumeric characters,
+     * dashes, undescores and periods, and has to start with a letter
+     * or an underscore.</p>
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // verify tag name
+     * $result = XML_Util::isValidName('invalidTag?');
+     * if (is_a($result, 'PEAR_Error')) {
+     *    print 'Invalid XML name: ' . $result->getMessage();
+     * }
+     * </code>
+     *
+     * @param string $string string that should be checked
+     *
+     * @return mixed true, if string is a valid XML name, PEAR error otherwise
+     *
+     * @todo support for other charsets
+     * @todo PEAR CS - unable to avoid 85-char limit on second preg_match
+     */
+    public static function isValidName($string)
+    {
+        // check for invalid chars
+        if (!preg_match('/^[[:alpha:]_]\\z/', $string{0})) {
+            return XML_Util::raiseError(
+                'XML names may only start with letter or underscore',
+                XML_UTIL_ERROR_INVALID_START
+            );
+        }
+
+        // check for invalid chars
+        $match = preg_match(
+            '/^([[:alpha:]_]([[:alnum:]\-\.]*)?:)?'
+            . '[[:alpha:]_]([[:alnum:]\_\-\.]+)?\\z/',
+            $string
+        );
+        if (!$match) {
+            return XML_Util::raiseError(
+                'XML names may only contain alphanumeric '
+                . 'chars, period, hyphen, colon and underscores',
+                XML_UTIL_ERROR_INVALID_CHARS
+            );
+        }
+        // XML name is valid
+        return true;
+    }
+
+    /**
+     * Replacement for XML_Util::raiseError
+     *
+     * Avoids the necessity to always require
+     * PEAR.php
+     *
+     * @param string $msg  error message
+     * @param int    $code error code
+     *
+     * @return PEAR_Error
+     * @todo   PEAR CS - should this use include_once instead?
+     */
+    public static function raiseError($msg, $code)
+    {
+        include_once 'PEAR.php';
+        return PEAR::raiseError($msg, $code);
+    }
+}
+?>
diff --git a/pkg/vtiger/modules/MailManager/modules/MailManager/views/Mail.php b/pkg/vtiger/modules/MailManager/modules/MailManager/views/Mail.php
index 34d07c68b98e66ceb8211fbd6a3d11e309a667d1..7d03ebff4cc62ac61393f14a575f7c473c66ece4 100755
--- a/pkg/vtiger/modules/MailManager/modules/MailManager/views/Mail.php
+++ b/pkg/vtiger/modules/MailManager/modules/MailManager/views/Mail.php
@@ -245,6 +245,7 @@ class MailManager_Mail_View extends MailManager_Abstract_View {
 		} else if ('attachment_dld' == $this->getOperationArg($request)) {
 			$attachmentName = $request->getRaw('_atname');
 			$attachmentName= str_replace(' ', '_', $attachmentName);
+			$attachmentId   = $request->get('_atid');
 
 			if (MailManager_Utils_Helper::allowedFileExtension($attachmentName)) {
 				// This is to handle larger uploads
@@ -253,7 +254,7 @@ class MailManager_Mail_View extends MailManager_Abstract_View {
 
 				$mail = new MailManager_Message_Model(false, false);
 				$mail->readFromDB($request->get('_muid'));
-				$attachment = $mail->attachments(true, $attachmentName);
+				$attachment = $mail->attachments(true, $attachmentName, $attachmentId);
 				//As we are sending attachment name, it will return only that attachment details
 				if($attachment[0]['data']) {
 					header("Content-type: application/octet-stream");
@@ -361,4 +362,4 @@ class MailManager_Mail_View extends MailManager_Abstract_View {
 		return $request->validateReadAccess();
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/pkg/vtiger/modules/Mobile/modules/Mobile/api/ws/FetchRecord.php b/pkg/vtiger/modules/Mobile/modules/Mobile/api/ws/FetchRecord.php
index b3cff51e21d3e63daf348eebc1bcbe2ba314addd..3695504a9cab4a1b8dda2e734157bb1397694eae 100644
--- a/pkg/vtiger/modules/Mobile/modules/Mobile/api/ws/FetchRecord.php
+++ b/pkg/vtiger/modules/Mobile/modules/Mobile/api/ws/FetchRecord.php
@@ -107,10 +107,11 @@ class Mobile_WS_FetchRecord extends Mobile_WS_Controller {
             }
             $relationId = $relation->getId();
 			$relationListView = Vtiger_RelationListView_Model::getInstance($parentRecordModel, $relatedModuleName, $relation->get('label'),$relationId);
-            $count = $relationListView->getRelatedEntriesCount();
-			$relatedRecordsCount[$relation->get('label')] = array('count'=>$count,'relatedModule'=>$relatedModuleName);
+			$count = $relationListView->getRelatedEntriesCount();
+			$relatedLabel = vtranslate($relation->get('label'), $relatedModuleName);
+			$relatedRecordsCount[$relatedLabel] = array('count'=>$count,'relatedModule'=>$relatedModuleName);
         }
 
 		return $relatedRecordsCount;
 	}
-}
\ No newline at end of file
+}
diff --git a/pkg/vtiger/modules/Mobile/modules/Mobile/api/ws/ListModuleRecords.php b/pkg/vtiger/modules/Mobile/modules/Mobile/api/ws/ListModuleRecords.php
index afb585f291d22545c258d0acc797e9cf848a35f3..f047348549eec8d341077e830fa45b6b1a35ba6a 100644
--- a/pkg/vtiger/modules/Mobile/modules/Mobile/api/ws/ListModuleRecords.php
+++ b/pkg/vtiger/modules/Mobile/modules/Mobile/api/ws/ListModuleRecords.php
@@ -39,7 +39,8 @@ class Mobile_WS_ListModuleRecords extends Mobile_WS_Controller {
 		
 		$headerFields = array();
 		$fields = array();
-		
+		$headerFieldColsMap = array();
+
 		$nameFields = $moduleModel->getNameFields();
 		if(is_string($nameFields)) {
 			$nameFieldModel = $moduleModel->getField($nameFields);
@@ -56,8 +57,12 @@ class Mobile_WS_ListModuleRecords extends Mobile_WS_Controller {
 		foreach($headerFieldModels as $fieldName => $fieldModel) {
 			$headerFields[] = $fieldName;
 			$fields[] = array('name'=>$fieldName, 'label'=>$fieldModel->get('label'), 'fieldType'=>$fieldModel->getFieldDataType());
+			$headerFieldColsMap[$fieldModel->get('column')] = $fieldName;
 		}
-		
+
+		if ($module == 'HelpDesk') $headerFieldColsMap['title'] = 'ticket_title';
+		if ($module == 'Documents') $headerFieldColsMap['title'] = 'notes_title';
+
 		$listViewModel = Vtiger_ListView_Model::getInstance($module, $filterId, $headerFields);
 		
 		if(!empty($sortOrder)) {
@@ -83,6 +88,10 @@ class Mobile_WS_ListModuleRecords extends Mobile_WS_Controller {
 				$record = array('id'=>$listViewEntryModel->getId());
 				foreach($data as $i => $value) {
 					if(is_string($i)) {
+						// Transform header-field (column to fieldname) in response.
+						if (isset($headerFieldColsMap[$i])) {
+							$i = $headerFieldColsMap[$i];
+						}	
 						$record[$i]= decode_html($value); 
 					}
 				}
diff --git a/pkg/vtiger/modules/ModComments/modules/ModComments/ModComments.php b/pkg/vtiger/modules/ModComments/modules/ModComments/ModComments.php
index cac136052dc48b8cc63f39147539feb5dde6df68..1d2832e3b4c7b3101bf8e2c9262b3a4ab23cd97b 100644
--- a/pkg/vtiger/modules/ModComments/modules/ModComments/ModComments.php
+++ b/pkg/vtiger/modules/ModComments/modules/ModComments/ModComments.php
@@ -66,16 +66,18 @@ class ModComments extends ModCommentsCore {
 
 		if (is_string($moduleNames)) $moduleNames = array($moduleNames);
 
+		$modCommentsModule = Vtiger_Module::getInstance('ModComments');
+		
 		$commentWidgetModules = array();
 		foreach($moduleNames as $moduleName) {
 			$module = Vtiger_Module::getInstance($moduleName);
 			if($module) {
 				$module->addLink($widgetType, $widgetName, "block://ModComments:modules/ModComments/ModComments.php");
+				$module->setRelatedList($modCommentsModule, 'ModComments', array(''), 'get_comments');
 				$commentWidgetModules[] = $moduleName;
 			}
 		}
 		if (count($commentWidgetModules) > 0) {
-			$modCommentsModule = Vtiger_Module::getInstance('ModComments');
 			$modCommentsModule->addLink('HEADERSCRIPT', 'ModCommentsCommonHeaderScript', 'modules/ModComments/ModCommentsCommon.js');
 			$modCommentsRelatedToField = Vtiger_Field::getInstance('related_to', $modCommentsModule);
 			$modCommentsRelatedToField->setRelatedModules($commentWidgetModules);
@@ -95,17 +97,19 @@ class ModComments extends ModCommentsCore {
 		include_once 'vtlib/Vtiger/Module.php';
 
 		if (is_string($moduleNames)) $moduleNames = array($moduleNames);
+		
+		$modCommentsModule = Vtiger_Module::getInstance('ModComments');
 
 		$commentWidgetModules = array();
 		foreach($moduleNames as $moduleName) {
 			$module = Vtiger_Module::getInstance($moduleName);
 			if($module) {
 				$module->deleteLink($widgetType, $widgetName, "block://ModComments:modules/ModComments/ModComments.php");
+				$module->unsetRelatedList($modCommentsModule, 'ModComments', 'get_comments');
 				$commentWidgetModules[] = $moduleName;
 			}
 		}
 		if (count($commentWidgetModules) > 0) {
-			$modCommentsModule = Vtiger_Module::getInstance('ModComments');
 			$modCommentsRelatedToField = Vtiger_Field::getInstance('related_to', $modCommentsModule);
 			$modCommentsRelatedToField->unsetRelatedModules($commentWidgetModules);
 		}
diff --git a/pkg/vtiger/modules/Webforms/layouts/v7/modules/Settings/Webforms/uitypes/Picklist.tpl b/pkg/vtiger/modules/Webforms/layouts/v7/modules/Settings/Webforms/uitypes/Picklist.tpl
index 9247db6c0cf18316d9e68db08a9300fc50575cf3..49e30db3171220a91ab704dc1fd83f54ed8dc565 100644
--- a/pkg/vtiger/modules/Webforms/layouts/v7/modules/Settings/Webforms/uitypes/Picklist.tpl
+++ b/pkg/vtiger/modules/Webforms/layouts/v7/modules/Settings/Webforms/uitypes/Picklist.tpl
@@ -25,6 +25,9 @@
 			<option value="{Vtiger_Util_Helper::toSafeHTML($PICKLIST_NAME)}" {if $PICKLIST_COLORS[$PICKLIST_NAME]}class="{$CLASS_NAME}"{/if} {if trim(decode_html($FIELD_MODEL->get('fieldvalue'))) eq trim($PICKLIST_NAME)} selected {/if}>{$PICKLIST_VALUE}</option>
 		{/foreach}
 	</select>
+	{if $FIELD_MODEL->getFieldName() eq 'targetmodule' and $MODE eq 'edit'}
+	<input type="hidden" name="targetmodule" value="{$FIELD_MODEL->get('fieldvalue')}" />
+	{/if}
 	{if $PICKLIST_COLORS}
 		<style type="text/css">
 			{foreach item=PICKLIST_VALUE key=PICKLIST_NAME from=$PICKLIST_VALUES}
diff --git a/schema/DatabaseSchema.xml b/schema/DatabaseSchema.xml
index 5e9a2bdbee92313c467cd037b807e7fe4556fd39..d266c2d97bdd767df2e03ec92a1e1b9d3134ad48 100644
--- a/schema/DatabaseSchema.xml
+++ b/schema/DatabaseSchema.xml
@@ -6997,6 +6997,7 @@
 	<table name="vtiger_dashboard_tabs">
 		<field name="id" type="I" size="19">
 			<key />
+			<autoincrement />
 		</field>
 		<field name="tabname" type="C" size="50" >
 			<unique />
@@ -7020,6 +7021,11 @@
 		<constraint>ADD CONSTRAINT vtiger_dashboard_tabs_ibfk_1 FOREIGN KEY (userid) REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		<opt>Engine=InnoDB</opt>
 	</table>
+	
+	<table name="vtiger_dashboard_tabs" alter="true">
+		<constraint>ADD CONSTRAINT tabname UNIQUE(tabname, userid)</constraint>
+		<opt>Engine=InnoDB</opt>
+	</table>
 
 	<table name="vtiger_app2tab">
 		<field name="tabid" type="I" size="11" />
diff --git a/vtigercron.php b/vtigercron.php
index 224edac30da6b399faea4e6570557d25ad8a4aa9..886ae0bd131a1d10df00322f86d3705de06fb0d5 100644
--- a/vtigercron.php
+++ b/vtigercron.php
@@ -24,8 +24,6 @@ require_once 'includes/Loader.php';
 vimport ('includes.runtime.EntryPoint');
 
 $site_URLArray = explode('/',$site_URL);
-$organization_name = $site_URLArray[2];
-$organization_name = str_replace('.od1.vtiger.com', '', $organization_name);
 
 $version = explode('.', phpversion());
 
@@ -36,10 +34,14 @@ if($php <  50300){
 	$hostName = gethostname();
 }
 
-$mailbody ="Instance dir : $root_directory <br/> Company Name : $organization_name <br/> Site Url : $site_URL <br/> Host Name : $hostName<br/>";
+$mailbody ="Instance dir : $root_directory <br/> Site Url : $site_URL <br/> Host Name : $hostName<br/>";
+$mailSubject = "[Alert] ";
 
-$mailSubject = "[Alert] $organization_name ";
-if(PHP_SAPI === "cli" || (isset($_SESSION["authenticated_user_id"]) &&	isset($_SESSION["app_unique_key"]) && $_SESSION["app_unique_key"] == $application_unique_key)){
+function vtigercron_detect_run_in_cli(){
+	return (!isset($_SERVER['SERVER_SOFTWARE']) && (php_sapi_name() == 'cli' ||  is_numeric($_SERVER['argc']) && $_SERVER['argc'] > 0));
+}
+
+if(vtigercron_detect_run_in_cli() || (isset($_SESSION["authenticated_user_id"]) &&	isset($_SESSION["app_unique_key"]) && $_SESSION["app_unique_key"] == $application_unique_key)){
 
 	$cronTasks = false;
 	if (isset($_REQUEST['service'])) {
diff --git a/vtlib/Vtiger/Functions.php b/vtlib/Vtiger/Functions.php
index 1cfecae8c9be54549e2715f5840946ec4bdb952b..3bf9236817a3778cc5d102ad22574039af597584 100644
--- a/vtlib/Vtiger/Functions.php
+++ b/vtlib/Vtiger/Functions.php
@@ -1069,7 +1069,7 @@ class Vtiger_Functions {
 		if ($mode == 'CRYPT') {
 			$salt = null;
 			if (function_exists('password_hash')) { // php 5.5+
-				$salt = password_hash();
+				$salt = password_hash($password, PASSWORD_DEFAULT);
 			} else {
 				$salt = '$2y$11$'.str_replace("+",".",substr(base64_encode(openssl_random_pseudo_bytes(17)),0,22));
 			}
diff --git a/vtlib/Vtiger/Mailer.php b/vtlib/Vtiger/Mailer.php
index 1987415c4bb7fb8ee9d87dd69562b37c37a37cec..3c69bc8723e7b24383b44d508140027502f58bdc 100644
--- a/vtlib/Vtiger/Mailer.php
+++ b/vtlib/Vtiger/Mailer.php
@@ -26,6 +26,7 @@ class Vtiger_Mailer extends PHPMailer {
 	 * Constructor
 	 */
 	function __construct() {
+		parent::__construct();
 		$this->initialize();
 	}
 
@@ -43,6 +44,7 @@ class Vtiger_Mailer extends PHPMailer {
 	 * @access private
 	 */
 	function initialize() {
+		$this->Timeout = 30; /* Issue #155: to allow anti-spam tech be successful */
 		$this->IsSMTP();
 
 		global $adb;
@@ -78,9 +80,11 @@ class Vtiger_Mailer extends PHPMailer {
 	function reinitialize() {
 		$this->ClearAllRecipients();
 		$this->ClearReplyTos();
+		$this->ClearCustomHeaders();
 		$this->Body = '';
 		$this->Subject ='';
 		$this->ClearAttachments();
+		$this->ErrorInfo = '';
 	}
 
 	/**