diff --git a/client/src/containers/Preferences/General/GeneralForm.js b/client/src/containers/Preferences/General/GeneralForm.js
index f799ff848..44f6f13c8 100644
--- a/client/src/containers/Preferences/General/GeneralForm.js
+++ b/client/src/containers/Preferences/General/GeneralForm.js
@@ -43,8 +43,8 @@ export default function PreferencesGeneralForm({}) {
           labelInfo={<FieldRequiredHint />}
           inline={true}
           intent={inputIntent({ error, touched })}
-          helperText={<ErrorMessage name="name" />}
           className={'form-group--org-name'}
+          helperText={'Shown on sales forms and purchase orders.'}
         >
           <InputGroup medium={'true'} {...field} />
         </FormGroup>
@@ -58,8 +58,8 @@ export default function PreferencesGeneralForm({}) {
           labelInfo={<FieldRequiredHint />}
           inline={true}
           intent={inputIntent({ error, touched })}
-          helperText={<ErrorMessage name="financial_date_start" />}
           className={classNames('form-group--select-list', CLASSES.FILL)}
+          helperText={'For reporting, you can specify any month as the start of your financial year (also called your financial reporting year or accounting year).'}
         >
           <DateInput
             {...momentFormatter('MMMM Do YYYY')}
@@ -121,8 +121,8 @@ export default function PreferencesGeneralForm({}) {
           labelInfo={<FieldRequiredHint />}
           className={classNames('form-group--base-currency', CLASSES.FILL)}
           inline={true}
-          helperText={<ErrorMessage name="base_currency" />}
           intent={inputIntent({ error, touched })}
+          helperText={"You can't change the base currency as there are transactions recorded in your organization."}
         >
           <ListSelect
             items={currencies}
diff --git a/client/src/containers/Preferences/General/GeneralFormPage.js b/client/src/containers/Preferences/General/GeneralFormPage.js
index 34dcbe3d2..a003ac049 100644
--- a/client/src/containers/Preferences/General/GeneralFormPage.js
+++ b/client/src/containers/Preferences/General/GeneralFormPage.js
@@ -48,9 +48,7 @@ function GeneralFormPage({
     });
     const onSuccess = (response) => {
       AppToaster.show({
-        message: formatMessage({
-          id: 'the_options_has_been_created_successfully',
-        }),
+        message: 'The general preferences has been saved.',
         intent: Intent.SUCCESS,
       });
       setSubmitting(false);
diff --git a/client/src/containers/Preferences/Users/UsersDataTable.js b/client/src/containers/Preferences/Users/UsersDataTable.js
index 3243b860a..3efcbf238 100644
--- a/client/src/containers/Preferences/Users/UsersDataTable.js
+++ b/client/src/containers/Preferences/Users/UsersDataTable.js
@@ -3,6 +3,8 @@ import React, { useCallback } from 'react';
 import { compose } from 'utils';
 import { DataTable } from 'components';
 
+import TableSkeletonRows from 'components/Datatable/TableSkeletonRows';
+
 import withDialogActions from 'containers/Dialog/withDialogActions';
 import withAlertActions from 'containers/Alert/withAlertActions';
 
@@ -60,6 +62,7 @@ function UsersDataTable({
       loading={isUsersLoading}
       headerLoading={isUsersLoading}
       progressBarLoading={isUsersFetching}
+      TableLoadingRenderer={TableSkeletonRows}
       noInitialFetch={true}
       ContextMenu={ActionsMenu}
       payload={{
diff --git a/client/src/style/pages/Preferences/GeneralForm.scss b/client/src/style/pages/Preferences/GeneralForm.scss
index cafc5a5ec..b76474de4 100644
--- a/client/src/style/pages/Preferences/GeneralForm.scss
+++ b/client/src/style/pages/Preferences/GeneralForm.scss
@@ -22,10 +22,13 @@
   }
 
   .bp3-form-group {
-    max-width: 550px;
+    max-width: 650px;
+    margin-bottom: 24px;
 
     .bp3-label {
-      min-width: 180px;
+      min-width: 190px;
+      font-weight: 600;
+      color: #38414e;
     }
 
     .bp3-form-content {