diff --git a/layouts/v7/modules/Users/UserViewHeader.tpl b/layouts/v7/modules/Users/UserViewHeader.tpl
index 0b11b52f635115d94ca1d40204e94333dba876b0..0aaa035d57c8a0e97eb0dc77aebf792d496ff1c2 100644
--- a/layouts/v7/modules/Users/UserViewHeader.tpl
+++ b/layouts/v7/modules/Users/UserViewHeader.tpl
@@ -36,7 +36,7 @@
                         {$RECORD->getName()}
                     </span>
                 </div>
-                <div class="pull-right col-md-7">
+                <div class="pull-right col-md-7 detailViewButtoncontainer">
                     <div class="btn-group pull-right">
                         {foreach item=DETAIL_VIEW_BASIC_LINK from=$DETAILVIEW_LINKS['DETAILVIEWBASIC']}
                             <button class="btn btn-default {if $DETAIL_VIEW_BASIC_LINK->getLabel() eq 'LBL_EDIT'}{/if}" id="{$MODULE}_detailView_basicAction_{Vtiger_Util_Helper::replaceSpaceWithUnderScores($DETAIL_VIEW_BASIC_LINK->getLabel())}"
diff --git a/layouts/v7/modules/Vtiger/uitypes/UserRole.tpl b/layouts/v7/modules/Vtiger/uitypes/UserRole.tpl
index 1375eee3943a5f3a259c7f0ff3c2b22bf3fc85eb..ebf9e7b3758bcbebf0984cc687271080d6536ca5 100644
--- a/layouts/v7/modules/Vtiger/uitypes/UserRole.tpl
+++ b/layouts/v7/modules/Vtiger/uitypes/UserRole.tpl
@@ -21,7 +21,7 @@
         {/if}
         >
     {foreach item=PICKLIST_VALUE key=PICKLIST_NAME from=$PICKLIST_VALUES}
-	<option value="{$PICKLIST_VALUE}" {if $FIELD_MODEL->get('fieldvalue') eq $PICKLIST_VALUE} selected {/if}>{vtranslate($PICKLIST_NAME, $MODULE)}</option>
+	<option value="{$PICKLIST_VALUE}" {if $FIELD_MODEL->get('fieldvalue') eq $PICKLIST_VALUE} selected {/if}>{$PICKLIST_NAME}</option>
 {/foreach}
 </select>
 {/strip}
\ No newline at end of file
diff --git a/pkg/vtiger/modules/CustomerPortal/modules/CustomerPortal/apis/DescribeModule.php b/pkg/vtiger/modules/CustomerPortal/modules/CustomerPortal/apis/DescribeModule.php
index 414910d1faaf21d8fe4003fc13f9e6e075d069ef..055779852ebaa2e13cc8940b5125beea78b0e3a9 100644
--- a/pkg/vtiger/modules/CustomerPortal/modules/CustomerPortal/apis/DescribeModule.php
+++ b/pkg/vtiger/modules/CustomerPortal/modules/CustomerPortal/apis/DescribeModule.php
@@ -45,10 +45,11 @@ class CustomerPortal_DescribeModule extends CustomerPortal_API_Abstract {
 						$value['default'] = Vtiger_Time_UIType::getTimeValueWithSeconds($value['default']);
 					}
 					$value['label'] = decode_html($value['label']);
-					if ($activeFields[$value['name']])
+					if ($activeFields[$value['name']]) {
 						$value['editable'] = true;
-					else
+					} else {
 						$value['editable'] = false;
+					}
 					$describeInfo['fields'][$key] = $value;
 
 					$position = array_search($value['name'], $activeFieldKeys);
diff --git a/pkg/vtiger/modules/CustomerPortal/modules/CustomerPortal/apis/FetchRelatedRecords.php b/pkg/vtiger/modules/CustomerPortal/modules/CustomerPortal/apis/FetchRelatedRecords.php
index fe00f70686d5585bd3ee584a1410df2a85fc6d26..3043d9cc21ccfda72329b21ab064e5127f3c103b 100644
--- a/pkg/vtiger/modules/CustomerPortal/modules/CustomerPortal/apis/FetchRelatedRecords.php
+++ b/pkg/vtiger/modules/CustomerPortal/modules/CustomerPortal/apis/FetchRelatedRecords.php
@@ -111,8 +111,7 @@ class CustomerPortal_FetchRelatedRecords extends CustomerPortal_API_Abstract {
 						}
 					}
 				}
-			}
-			else {
+			} else {
 				$activeFields = CustomerPortal_Utils::getActiveFields($module);
 				$fields = implode(',', $activeFields);
 				$limitCaluse = sprintf('ORDER BY modifiedtime DESC LIMIT %s,%s', ($page * $pageLimit), $pageLimit);
diff --git a/pkg/vtiger/modules/CustomerPortal/modules/CustomerPortal/schema.xml b/pkg/vtiger/modules/CustomerPortal/modules/CustomerPortal/schema.xml
index c33b366ffc11369189f48666fd57826986f0acb5..9fb4a1f7da0dd95def957bb7b937325b05b5a2ba 100644
--- a/pkg/vtiger/modules/CustomerPortal/modules/CustomerPortal/schema.xml
+++ b/pkg/vtiger/modules/CustomerPortal/modules/CustomerPortal/schema.xml
@@ -4,27 +4,27 @@
 		<table>
 			<name>vtiger_customerportal_tabs</name>
 			<sql><![CDATA[CREATE TABLE `vtiger_customerportal_tabs` (
-  `tabid` int(19) NOT NULL,
-  `visible` int(1) default '1',
-  `sequence` int(1) default NULL,
-  PRIMARY KEY  (`tabid`)
-)]]></sql>
+						`tabid` int(19) NOT NULL,
+						`visible` int(1) default '1',
+						`sequence` int(1) default NULL,
+						PRIMARY KEY  (`tabid`)
+			)]]></sql>
 		</table>
 		<table>
 			<name>vtiger_customerportal_fields</name>
 			<sql><![CDATA[CREATE TABLE `vtiger_customerportal_fields` (
-  `tabid` int(19) NOT NULL,
-  `fieldid` int(19) default NULL,
-  `visible` int(1) default NULL
-)]]></sql>
+							`tabid` int(19) NOT NULL,
+							`fieldid` int(19) default NULL,
+							`visible` int(1) default NULL
+			)]]></sql>
 		</table>
 		<table>
 			<name>vtiger_customerportal_prefs</name>
 			<sql><![CDATA[CREATE TABLE `vtiger_customerportal_prefs` (
-  `tabid` int(11) NOT NULL,
-  `prefkey` varchar(100) default NULL,
-  `prefvalue` int(20) default NULL
-)]]></sql>
+							`tabid` int(11) NOT NULL,
+							`prefkey` varchar(100) default NULL,
+							`prefvalue` int(20) default NULL
+			)]]></sql>
 		</table>
 	</tables>
 </schema>
diff --git a/pkg/vtiger/modules/CustomerPortal/settings/actions/Save.php b/pkg/vtiger/modules/CustomerPortal/settings/actions/Save.php
index 1b95d458d0318e8d973c29ebba1066ec8cc8521f..0bd65003eea490027c57eb1505f05f4ef182554e 100644
--- a/pkg/vtiger/modules/CustomerPortal/settings/actions/Save.php
+++ b/pkg/vtiger/modules/CustomerPortal/settings/actions/Save.php
@@ -25,7 +25,6 @@ class Settings_CustomerPortal_Save_Action extends Settings_Vtiger_Index_Action {
 			$moduleModel->set('shortcuts', $request->get('defaultShortcuts'));
 			$moduleModel->set('moduleFieldsInfo', $request->get('moduleFieldsInfo'));
 			$moduleModel->set('relatedModuleList', $request->get('relatedModuleList'));
-			$moduleModel->set('charts', $request->get('activeCharts'));
 			$moduleModel->set('widgets', $request->get('activeWidgets'));
 			$moduleModel->set('recordsVisible', $request->get('recordsVisible'));
 			$moduleModel->set('recordPermissions', $request->get('recordPermissions'));
diff --git a/pkg/vtiger/modules/CustomerPortal/settings/models/Module.php b/pkg/vtiger/modules/CustomerPortal/settings/models/Module.php
index cf8f8cad1f52ab61172f544a86371c9d08fe8fde..bf5937465d5cefcb7af7468402b499111cf20c2d 100644
--- a/pkg/vtiger/modules/CustomerPortal/settings/models/Module.php
+++ b/pkg/vtiger/modules/CustomerPortal/settings/models/Module.php
@@ -125,12 +125,9 @@ class Settings_CustomerPortal_Module_Model extends Settings_Vtiger_Module_Model
 
 		//Update the dashboard widgets, charts, announcement and support_notification details.
 		$activeWidgets['widgets'] = $widgets;
-		$activeCharts['charts'] = $charts;
 		$dashboardWidgets = json_encode($activeWidgets);
-		$dashboardCharts = json_encode($activeCharts);
-		if ($dashboardWidgets || $dashboardCharts) {
-			$db->pquery('UPDATE vtiger_customerportal_settings SET default_assignee = ? ,support_notification = ?
-						,announcement = ?,widgets = ?,charts=?', array($defaultAssignee, $renewalPeriod, $announcement, $dashboardWidgets, $dashboardCharts));
+		if ($dashboardWidgets) {
+			$db->pquery('UPDATE vtiger_customerportal_settings SET default_assignee=?, support_notification=?, announcement=?, widgets=?', array($defaultAssignee, $renewalPeriod, $announcement, $dashboardWidgets));
 		}
 		//Update module field info
 		if (!empty($moduleFieldsInfo)) {