diff --git a/client/src/components/Items/ItemsCategoryList.js b/client/src/components/Items/ItemsCategoryList.js
index a8c5f5388..5da794f8b 100644
--- a/client/src/components/Items/ItemsCategoryList.js
+++ b/client/src/components/Items/ItemsCategoryList.js
@@ -5,25 +5,34 @@ import DialogConnect from 'connectors/Dialog.connector';
 import LoadingIndicator from 'components/LoadingIndicator';
 import { compose } from 'utils';
 import DataTable from 'components/DataTable';
-import { Button, Popover, Menu, MenuItem, Position } from '@blueprintjs/core';
+import {
+  Button,
+  Popover,
+  Menu,
+  MenuItem,
+  Position,
+  Classes,
+  Tooltip,
+} from '@blueprintjs/core';
 
 const ItemsCategoryList = ({
   categories,
   onFetchData,
   onDeleteCategory,
   onEditCategory,
-  openDialog
+  openDialog,
+  count,
 }) => {
-  const handelEditCategory = category => () => {
+  const handelEditCategory = (category) => () => {
     openDialog('item-form', { action: 'edit', id: category.id });
     onEditCategory(category.id);
   };
 
-  const handleDeleteCategory = category => () => {
+  const handleDeleteCategory = (category) => () => {
     onDeleteCategory(category);
   };
 
-  const actionMenuList = category => (
+  const actionMenuList = (category) => (
     <Menu>
       <MenuItem text='Edit Category' onClick={handelEditCategory(category)} />
       <MenuItem
@@ -38,17 +47,22 @@ const ItemsCategoryList = ({
       {
         id: 'name',
         Header: 'Category Name',
-        accessor: 'name'
+        accessor: 'name',
+        width: 150,
       },
       {
         id: 'description',
         Header: 'Description',
-        accessor: 'description'
+        accessor: 'description',
+        className: 'description',
+        width: 150,
       },
       {
         id: 'count',
         Header: 'Count',
-        // accessor: ''
+        accessor: () => <span>{count}</span>,
+        className: 'count',
+        width: 50,
       },
       {
         id: 'actions',
@@ -62,9 +76,9 @@ const ItemsCategoryList = ({
           </Popover>
         ),
         className: 'actions',
-        width: 50
+        width: 50,
         // canResize: false
-      }
+      },
     ],
     []
   );
@@ -73,6 +87,7 @@ const ItemsCategoryList = ({
     onFetchData && onFetchData();
   }, []);
 
+
   return (
     <LoadingIndicator spinnerSize={30}>
       <DataTable
@@ -81,6 +96,8 @@ const ItemsCategoryList = ({
         onFetchData={handelFetchData}
         manualSortBy={true}
         selectionColumn={true}
+        expandable={true}
+        treeGraph={true}
       />
     </LoadingIndicator>
   );
diff --git a/client/src/components/Preferences/PreferencesContent.js b/client/src/components/Preferences/PreferencesContent.js
index 4e2cd404e..33fad9d86 100644
--- a/client/src/components/Preferences/PreferencesContent.js
+++ b/client/src/components/Preferences/PreferencesContent.js
@@ -2,14 +2,14 @@ import React from 'react';
 import PreferencesTopbar from 'components/Preferences/PreferencesTopbar';
 import PreferencesContentRoute from 'components/Preferences/PreferencesContentRoute';
 
-export default function() {
+export default function () {
   return (
-    <div className="dashboard-content dashboard-content--preferences">
-      <PreferencesTopbar pageTitle={"asdad"}/>
-      
-      <div class="dashboard__preferences-content">
+    <div className='dashboard-content dashboard-content--preferences'>
+      <PreferencesTopbar pageTitle={'asdad'} />
+
+      <div className='dashboard__preferences-content'>
         <PreferencesContentRoute />
       </div>
     </div>
-  )
-}
\ No newline at end of file
+  );
+}
diff --git a/client/src/components/Sidebar/SidebarContainer.js b/client/src/components/Sidebar/SidebarContainer.js
index 77c0c670f..35395c907 100644
--- a/client/src/components/Sidebar/SidebarContainer.js
+++ b/client/src/components/Sidebar/SidebarContainer.js
@@ -1,11 +1,70 @@
-import React from 'react';
+import * as React from 'react';
+import { Scrollbar } from 'react-scrollbars-custom';
+
+const style = {
+  holder: {
+    position: 'relative',
+    width: '100%',
+    height: '100%',
+  },
+
+  wrapper: {
+    position: 'absolute',
+    top: 0,
+    left: 0,
+    bottom: 0,
+    right: 0,
+  },
+
+  content: {
+    boxSizing: 'border-box',
+  },
+
+  track: {
+    common: {
+      position: 'absolute',
+      overflow: 'hidden',
+      borderRadius: 4,
+      background: 'rgba(0,0,0,.1)',
+      userSelect: 'none',
+    },
+    x: {
+      height: 10,
+      width: 'calc(100% - 20px)',
+      bottom: 0,
+      left: 10,
+    },
+    y: {
+      width: 10,
+      height: 'calc(100% - 20px)',
+      top: 10,
+    },
+  },
+
+  thumb: {
+    common: {
+      cursor: 'pointer',
+      borderRadius: 4,
+      background: 'rgba(0,0,0,.4)',
+    },
+    x: {
+      height: '100%',
+      width: 0,
+    },
+    y: {
+      width: '100%',
+      height: 0,
+    },
+  },
+};
 
 export default function SidebarContainer(props) {
   return (
-    <div className="sidebar" id="sidebar">
-      <div class="sidebar__inner">
-        {props.children}
-      </div>
+    <div className='sidebar' id='sidebar'>
+      {/* <div className='sidebar__inner'>{props.children}</div> */}
+      <Scrollbar noDefaultStyles={true}>
+        <div className='sidebar__inner'>{props.children}</div>
+      </Scrollbar>
     </div>
-  )
-}
\ No newline at end of file
+  );
+}
diff --git a/client/src/components/Sidebar/SidebarMenu.js b/client/src/components/Sidebar/SidebarMenu.js
index 260e2886f..fd86d70df 100644
--- a/client/src/components/Sidebar/SidebarMenu.js
+++ b/client/src/components/Sidebar/SidebarMenu.js
@@ -32,7 +32,7 @@ export default function SidebarMenu() {
             dropdownType={item.dropdownType || 'collapse'}
             caretIconSize={15}
             onClick={handleItemClick}
-            callapseActive={!!isActive}
+            // callapseActive={!!isActive}
             className={classNames({ 'is-active': isActive })} />
       );
     });
diff --git a/client/src/connectors/ItemsCategory.connect.js b/client/src/connectors/ItemsCategory.connect.js
index 50b4d9518..799bee209 100644
--- a/client/src/connectors/ItemsCategory.connect.js
+++ b/client/src/connectors/ItemsCategory.connect.js
@@ -3,31 +3,31 @@ import {
   fetchItemCategories,
   submitItemCategory,
   deleteItemCategory,
-  editItemCategory
+  editItemCategory,
 } from 'store/itemCategories/itemsCategory.actions';
 import { getDialogPayload } from 'store/dashboard/dashboard.reducer';
 import { getCategoryId } from 'store/itemCategories/itemsCategory.reducer';
 
 export const mapStateToProps = (state, props) => {
   const dialogPayload = getDialogPayload(state, 'item-form');
+
   return {
     categories: state.itemCategories.categories,
-    categoriesList: Object.values(state.itemCategories.categories),
+    count: 1,
     name: 'item-form',
     payload: { action: 'new', id: null },
     editItemCategory:
       dialogPayload && dialogPayload.action === 'edit'
         ? state.itemCategories.categories[dialogPayload.id]
         : {},
-    getCategoryId: id => getCategoryId(state, id)
+    getCategoryId: (id) => getCategoryId(state, id),
   };
 };
-
-export const mapDispatchToProps = dispatch => ({
-  requestSubmitItemCategory: form => dispatch(submitItemCategory({ form })),
+export const mapDispatchToProps = (dispatch) => ({
+  requestSubmitItemCategory: (form) => dispatch(submitItemCategory({ form })),
   requestFetchItemCategories: () => dispatch(fetchItemCategories()),
-  requestDeleteItemCategory: id => dispatch(deleteItemCategory(id)),
-  requestEditItemCategory: (id, form) => dispatch(editItemCategory(id, form))
+  requestDeleteItemCategory: (id) => dispatch(deleteItemCategory(id)),
+  requestEditItemCategory: (id, form) => dispatch(editItemCategory(id, form)),
 });
 
 export default connect(mapStateToProps, mapDispatchToProps);
diff --git a/client/src/connectors/Settings.connect.js b/client/src/connectors/Settings.connect.js
index b7a21d0da..a972ffe8b 100644
--- a/client/src/connectors/Settings.connect.js
+++ b/client/src/connectors/Settings.connect.js
@@ -1,4 +1,10 @@
-import {connect} from 'react-redux';
+import { connect } from 'react-redux';
+import {
+  FetchOption,
+  FetchOptions,
+  submitOptions,
+} from 'store/settings/settings.actions';
+
 
 export const mapStateToProps = (state, props) => {
   return {
@@ -7,7 +13,8 @@ export const mapStateToProps = (state, props) => {
 };
 
 export const mapDispatchToProps = (dispatch) => ({
-  
+  requestSubmitOptions: (form) => dispatch(submitOptions({ form })),
+  requestFetchOptions: () => dispatch(FetchOptions({})),
 });
 
-export default connect(mapStateToProps, mapDispatchToProps);
\ No newline at end of file
+export default connect(mapStateToProps, mapDispatchToProps);
diff --git a/client/src/connectors/UsersList.connector.js b/client/src/connectors/UsersList.connector.js
index 7fdc72ec8..1513f46f6 100644
--- a/client/src/connectors/UsersList.connector.js
+++ b/client/src/connectors/UsersList.connector.js
@@ -1,22 +1,20 @@
-import {connect} from 'react-redux';
-import {
-  fetchUsers,
-  fetchUser,
-  deleteUser,
-} from 'store/users/users.actions';
+import { connect } from 'react-redux';
+import { fetchUsers, fetchUser, deleteUser } from 'store/users/users.actions';
 import t from 'store/types';
 
 export const mapStateToProps = (state, props) => ({
-  usersList: state.users.list
+  usersList: state.users.list.results,
 });
 
 export const mapDispatchToProps = (dispatch) => ({
-  openDialog: (name, payload) => dispatch({ type: t.OPEN_DIALOG, name, payload }),
-  closeDialog: (name, payload) => dispatch({ type: t.CLOSE_DIALOG, name, payload }),
+  openDialog: (name, payload) =>
+    dispatch({ type: t.OPEN_DIALOG, name, payload }),
+  closeDialog: (name, payload) =>
+    dispatch({ type: t.CLOSE_DIALOG, name, payload }),
 
-  fetchUsers: () => dispatch(fetchUsers({  })),
+  fetchUsers: () => dispatch(fetchUsers({})),
   fetchUser: (id) => dispatch(fetchUser({ id })),
   deleteUser: (id) => dispatch(deleteUser({ id })),
 });
 
-export default connect(mapStateToProps, mapDispatchToProps);
\ No newline at end of file
+export default connect(mapStateToProps, mapDispatchToProps);
diff --git a/client/src/containers/Dashboard/Dialogs/UserFormDialog.js b/client/src/containers/Dashboard/Dialogs/UserFormDialog.js
index 29289dc0c..770969448 100644
--- a/client/src/containers/Dashboard/Dialogs/UserFormDialog.js
+++ b/client/src/containers/Dashboard/Dialogs/UserFormDialog.js
@@ -1,6 +1,6 @@
-import React from 'react';
-import { useIntl } from "react-intl"
-import {useFormik} from 'formik';
+import React, { useMemo } from 'react';
+import { useIntl } from 'react-intl';
+import { useFormik } from 'formik';
 import * as Yup from 'yup';
 import {
   Dialog,
@@ -18,8 +18,12 @@ import UserFormDialogConnect from 'connectors/UserFormDialog.connector';
 import DialogReduxConnect from 'components/DialogReduxConnect';
 import AppToaster from 'components/AppToaster';
 import useAsync from 'hooks/async';
-import {objectKeysTransform} from 'utils';
-import {pick, snakeCase} from 'lodash';
+import { objectKeysTransform } from 'utils';
+import { pick, snakeCase } from 'lodash';
+import ErrorMessage from 'components/ErrorMessage';
+import classNames from 'classnames';
+import Icon from 'components/Icon';
+import { compose } from 'utils';
 
 function UserFormDialog({
   fetchUser,
@@ -34,27 +38,21 @@ function UserFormDialog({
   const intl = useIntl();
   const fetchHook = useAsync(async () => {
     await Promise.all([
-      ...(payload.action === 'edit') ? [
-        fetchUser(payload.user.id),  
-      ] : [],
+      ...(payload.action === 'edit' ? [fetchUser(payload.user.id)] : []),
     ]);
   }, false);
 
   const validationSchema = Yup.object().shape({
-    first_name: Yup.string().required(),
-    last_name: Yup.string().required(),
     email: Yup.string().email().required(),
-    phone_number: Yup.string().required(),
-    password: Yup.string().min(5).required(),
   });
 
   const initialValues = {
     status: 1,
-    ...payload.action === 'edit' && 
+    ...(payload.action === 'edit' &&
       pick(
         objectKeysTransform(payload.user, snakeCase),
         Object.keys(validationSchema.fields)
-      ),
+      )),
     password: '',
   };
 
@@ -84,113 +82,76 @@ function UserFormDialog({
       }
     },
   });
+  const { values, errors, touched } = useMemo(() => formik, [formik]);
 
   const statusOptions = [
-    {value: 1, label: 'Active'},
-    {value: 2, label: 'Inactive'},
+    { value: 1, label: 'Active' },
+    { value: 2, label: 'Inactive' },
   ];
 
-  const onDialogOpening = () => { fetchHook.execute(); };
+  const onDialogOpening = () => {
+    fetchHook.execute();
+  };
 
   const onDialogClosed = () => {
     formik.resetForm();
-
   };
 
-  const handleClose = () => { closeDialog(name); };
+  const handleClose = () => {
+    closeDialog(name);
+  };
 
   return (
     <Dialog
-      isOpen={isOpen}
       name={name}
-      title={payload.action === 'edit' ? 'Edit User' : 'New User'}
+      title={payload.action === 'edit' ? 'Edit invite' : 'New invite'}
+      className={classNames({
+        'dialog--loading': fetchHook.pending,
+        'dialog--invite-form': true,
+      })}
+      autoFocus={true}
+      canEscapeKeyClose={true}
+      isOpen={isOpen}
       isLoading={fetchHook.pending}
       onClosed={onDialogClosed}
-      onOpening={onDialogOpening}>
-
+      onOpening={onDialogOpening}
+    >
       <form onSubmit={formik.handleSubmit}>
         <div className={Classes.DIALOG_BODY}>
           <FormGroup
-            label={'First Name'}
-            className={'form-group--first-name'}
-            intent={formik.errors.first_name && Intent.DANGER}
-            helperText={formik.errors.first_name && formik.errors.first_name}
-            inline={true}>
-
+            label={'Email'}
+            className={'form-group--email'}
+            intent={errors.email && touched.email && Intent.DANGER}
+            helperText={<ErrorMessage name='email' {...formik} />}
+            inline={true}
+          >
             <InputGroup
-              intent={formik.errors.first_name && Intent.DANGER}
-              {...formik.getFieldProps('first_name')} />
+              medium={true}
+              intent={errors.email && touched.email && Intent.DANGER}
+              {...formik.getFieldProps('email')}
+            />
           </FormGroup>
-          
-          <FormGroup
-            label={'Last Name'}
-            className={'form-group--last-name'}
-            intent={formik.errors.last_name && Intent.DANGER}
-            helperText={formik.errors.last_name && formik.errors.last_name}
-            inline={true}>
-
-            <InputGroup
-              intent={formik.errors.last_name && Intent.DANGER}
-              {...formik.getFieldProps('last_name')} />
-          </FormGroup>
-
           <FormGroup
             label={'Email'}
             className={'form-group--email'}
-            intent={formik.errors.email && Intent.DANGER}
-            helperText={formik.errors.email && formik.errors.email}
-            inline={true}>
-
+            intent={errors.email && touched.email && Intent.DANGER}
+            helperText={<ErrorMessage name='email' {...formik} />}
+            inline={true}
+          >
             <InputGroup
-              intent={formik.errors.email && Intent.DANGER}
-              {...formik.getFieldProps('email')} />
+              medium={true}
+              intent={errors.email && touched.email && Intent.DANGER}
+              {...formik.getFieldProps('email')}
+            />
           </FormGroup>
+        </div>
 
-          <FormGroup
-            label={'Phone Number'}
-            className={'form-group--phone-number'}
-            intent={formik.errors.phone_number && Intent.DANGER}
-            helperText={formik.errors.phone_number && formik.errors.phone_number}
-            inline={true}>
-
-            <InputGroup
-              intent={formik.errors.phone_number && Intent.DANGER}
-              {...formik.getFieldProps('phone_number')} />
-          </FormGroup>
-
-          <FormGroup
-            label={'Password'}
-            className={'form-group--password'}
-            intent={formik.errors.password && Intent.DANGER}
-            helperText={formik.errors.password && formik.errors.password}
-            inline={true}>
-
-            <InputGroup
-              intent={formik.errors.password && Intent.DANGER}
-              className={Classes.FILL}
-              {...formik.getFieldProps('password')} />
-          </FormGroup>
-
-          <FormGroup
-            label={'Status'}
-            className={'form-group--status'}
-            intent={formik.errors.status && Intent.DANGER}
-            helperText={formik.errors.status && formik.errors.status}
-            inline={true}>
-
-            <HTMLSelect
-              options={statusOptions}
-              className={Classes.FILL}
-              {...formik.getFieldProps(`status`)} />
-          </FormGroup>
-
-          <div className={Classes.DIALOG_FOOTER}>
-            <div className={Classes.DIALOG_FOOTER_ACTIONS}>
-              <Button onClick={handleClose}>Close</Button>
-              <Button intent={Intent.PRIMARY} type="submit">
-                { payload.action === 'edit' ? 'Edit' : 'Submit' }
-              </Button>
-            </div>
+        <div className={Classes.DIALOG_FOOTER}>
+          <div className={Classes.DIALOG_FOOTER_ACTIONS}>
+            <Button onClick={handleClose}>Close</Button>
+            <Button intent={Intent.PRIMARY} type='submit'>
+              {payload.action === 'edit' ? 'Edit' : 'invite'}
+            </Button>
           </div>
         </div>
       </form>
@@ -198,4 +159,7 @@ function UserFormDialog({
   );
 }
 
-export default UserFormDialogConnect(DialogReduxConnect(UserFormDialog));
\ No newline at end of file
+export default compose(
+  UserFormDialogConnect,
+  DialogReduxConnect
+)(UserFormDialog);
diff --git a/client/src/containers/Dashboard/Items/ItemsCategoryActionsBar.js b/client/src/containers/Dashboard/Items/ItemsCategoryActionsBar.js
index 92ea85da6..fe2c1f343 100644
--- a/client/src/containers/Dashboard/Items/ItemsCategoryActionsBar.js
+++ b/client/src/containers/Dashboard/Items/ItemsCategoryActionsBar.js
@@ -3,21 +3,45 @@ import {} from 'reselect';
 import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
 
 import { compose } from 'utils';
-import { NavbarGroup, Button, Classes, Intent } from '@blueprintjs/core';
+import {
+  NavbarGroup,
+  Button,
+  Classes,
+  Intent,
+  Popover,
+  Position,
+  PopoverInteractionKind,
+} from '@blueprintjs/core';
+import classNames from 'classnames';
 import Icon from 'components/Icon';
 import DashboardConnect from 'connectors/Dashboard.connector';
 import ItemsCategoryConnect from 'connectors/ItemsCategory.connect';
 import DialogConnect from 'connectors/Dialog.connector';
+import FilterDropdown from 'components/FilterDropdown';
+import ResourceConnect from 'connectors/Resource.connector';
 
-const ItemsCategoryActionsBar = ({ openDialog, onDeleteCategory }) => {
+const ItemsCategoryActionsBar = ({
+  openDialog,
+  onDeleteCategory,
+  onFilterChanged,
+  getResourceFields,
+}) => {
   const onClickNewCategory = () => {
     openDialog('item-form', {});
   };
 
-  const handleDeleteCategory = category => {
+  const handleDeleteCategory = (category) => {
     onDeleteCategory(category);
   };
 
+  const categoriesFields = getResourceFields('itemCategories');
+
+  const filterDropdown = FilterDropdown({
+    fields: categoriesFields,
+    onFilterChange: (filterConditions) => {
+      onFilterChanged && onFilterChanged(filterConditions);
+    },
+  });
   return (
     <DashboardActionsBar>
       <NavbarGroup>
@@ -27,6 +51,17 @@ const ItemsCategoryActionsBar = ({ openDialog, onDeleteCategory }) => {
           text='New Category'
           onClick={onClickNewCategory}
         />
+        <Popover
+          content={filterDropdown}
+          interactionKind={PopoverInteractionKind.CLICK}
+          position={Position.BOTTOM_LEFT}
+        >
+          <Button
+            className={classNames(Classes.MINIMAL, 'button--filter')}
+            text='Filter'
+            icon={<Icon icon='filter' />}
+          />
+        </Popover>
 
         <Button
           className={Classes.MINIMAL}
@@ -54,5 +89,6 @@ const ItemsCategoryActionsBar = ({ openDialog, onDeleteCategory }) => {
 export default compose(
   DialogConnect,
   DashboardConnect,
-  ItemsCategoryConnect
+  ItemsCategoryConnect,
+  ResourceConnect
 )(ItemsCategoryActionsBar);
diff --git a/client/src/containers/Dashboard/Preferences/General.js b/client/src/containers/Dashboard/Preferences/General.js
index b7031dc4e..2f1a8eeb2 100644
--- a/client/src/containers/Dashboard/Preferences/General.js
+++ b/client/src/containers/Dashboard/Preferences/General.js
@@ -1,4 +1,4 @@
-import React, { useState, useCallback, useMemo } from 'react';
+import React, { useState, useCallback, useMemo, useEffect } from 'react';
 import { useFormik } from 'formik';
 import * as Yup from 'yup';
 import {
@@ -10,16 +10,24 @@ import {
   Classes,
 } from '@blueprintjs/core';
 
-import { optionsMapToArray, momentFormatter } from 'utils';
+import { optionsMapToArray, momentFormatter, optionsArrayToMap } from 'utils';
 import { TimezonePicker } from '@blueprintjs/timezone';
 import { Select } from '@blueprintjs/select';
 import classNames from 'classnames';
 import ErrorMessage from 'components/ErrorMessage';
 import Icon from 'components/Icon';
+import { compose } from 'utils';
+import SettingsConnect from 'connectors/Settings.connect';
+import AppToaster from 'components/AppToaster';
+import { useIntl } from 'react-intl';
+import useAsync from 'hooks/async';
 
-function GeneralPreferences(props) {
+function GeneralPreferences({
+  organizationSettings,
+  requestSubmitOptions,
+  requestFetchOptions,
+}) {
   const [selectedItems, setSelectedItems] = useState({});
-  const [disableItems, setDisableItems] = useState(false);
   const [timeZone, setTimeZone] = useState('');
 
   const businessLocation = [
@@ -28,8 +36,8 @@ function GeneralPreferences(props) {
     { id: 212, name: 'Morocco', code: 'MA' },
   ];
   const languagesDisplay = [
-    { name: 'EN', label: 'English' },
-    { name: 'Arb', label: 'Arabic' },
+    { id: 0, name: 'EN', label: 'English' },
+    { id: 1, name: 'Arb', label: 'Arabic' },
   ];
   const currencies = [
     { id: 0, name: 'US Dollar', code: 'USD' },
@@ -41,34 +49,59 @@ function GeneralPreferences(props) {
     { id: 1, name: 'August-December', label: 'August-December' },
   ];
   const dateFormat = [
-    { name: '04/11/2020', format: 'MM-DD-YY' },
-    { name: '2020/03/21', format: 'YY/MM/DD' },
-    { name: 'Apr 11, 2020', format: 'MMMM yyyy' },
-    { name: 'Saturday, Apr 11, 2020', format: 'EEEE, MMM d, yyyy' },
+    { id: 1, name: '04/11/2020', format: 'MM-DD-YY' },
+    { id: 3, name: '2020/03/21', format: 'YY/MM/DD' },
+    { id: 4, name: 'Apr 11, 2020', format: 'MMMM yyyy' },
+    { id: 6, name: 'Saturday, Apr 11, 2020', format: 'EEEE, MMM d, yyyy' },
   ];
+
+  const intl = useIntl();
+
   const validationSchema = Yup.object().shape({
-    organization_name: Yup.string().required('required field'),
-    organization_industry: Yup.string().required('required field'),
-    business_location: Yup.string().required('required field'),
-    base_currency: Yup.string().required('required field'),
-    fiscal_year: Yup.string().required('required field'),
-    language: Yup.string().required('required field'),
-    time_zone: Yup.date().required('required field'),
-    date_format: Yup.date().required('required field'),
+    name: Yup.string().required(intl.formatMessage({ id: 'required' })),
+    industry: Yup.string().required(intl.formatMessage({ id: 'required' })),
+    location: Yup.string().required(intl.formatMessage({ id: 'required' })),
+    base_currency: Yup.string().required(
+      intl.formatMessage({ id: 'required' })
+    ),
+    fiscal_year: Yup.string().required(intl.formatMessage({ id: 'required' })),
+    language: Yup.string().required(intl.formatMessage({ id: 'required' })),
+    // time_zone: Yup.object().required(intl.formatMessage({ id: 'required' })),
+    date_format: Yup.date().required(intl.formatMessage({ id: 'required' })),
   });
+  console.log(organizationSettings.name);
 
   const formik = useFormik({
     enableReinitialize: true,
-    initialValues: {},
+    initialValues: {
+      ...organizationSettings,
+    },
     validationSchema: validationSchema,
-    onSubmit: (values) => {
+
+    onSubmit: (values, { setSubmitting }) => {
       const options = optionsMapToArray(values).map((option) => {
-        return { ...option, group: 'general' };
+        return { key: option.key, ...option, group: 'organization' };
       });
+
+      requestSubmitOptions({ options })
+        .then((response) => {
+          AppToaster.show({
+            message: 'The_Options_has_been_Submit',
+          });
+          setSubmitting(false);
+        })
+        .catch((error) => {
+          setSubmitting(false);
+        });
     },
   });
+
   const { errors, values, touched } = useMemo(() => formik, [formik]);
 
+  const fetchHook = useAsync(async () => {
+    await Promise.all([requestFetchOptions()]);
+  });
+
   const businessLocationItem = (item, { handleClick }) => (
     <MenuItem
       className={'preferences-menu'}
@@ -107,7 +140,7 @@ function GeneralPreferences(props) {
     />
   );
 
-  const data_Format = (item, { handleClick }) => (
+  const date_format = (item, { handleClick }) => (
     <MenuItem
       className={'preferences-menu'}
       key={item.id}
@@ -126,6 +159,7 @@ function GeneralPreferences(props) {
       formik.setFieldValue(filedName, filed.name);
     };
   };
+
   const getSelectedItemLabel = (filedName, defaultLabel) => {
     return typeof selectedItems[filedName] !== 'undefined'
       ? selectedItems[filedName].name
@@ -140,42 +174,26 @@ function GeneralPreferences(props) {
         <FormGroup
           label={'Organization Name'}
           inline={true}
-          intent={
-            errors.organization_name &&
-            touched.organization_name &&
-            Intent.DANGER
-          }
-          helperText={<ErrorMessage name='organization_name' {...formik} />}
+          intent={errors.name && touched.name && Intent.DANGER}
+          helperText={<ErrorMessage name='name' {...formik} />}
         >
           <InputGroup
-            medium={true}
-            intent={
-              errors.organization_name &&
-              touched.organization_name &&
-              Intent.DANGER
-            }
-            {...formik.getFieldProps('organization_name')}
+            medium={'true'}
+            intent={errors.name && touched.name && Intent.DANGER}
+            {...formik.getFieldProps('name')}
           />
         </FormGroup>
 
         <FormGroup
           label={'Organization Industry'}
           inline={true}
-          intent={
-            errors.organization_industry &&
-            touched.organization_industry &&
-            Intent.DANGER
-          }
-          helperText={<ErrorMessage name='organization_industry' {...formik} />}
+          intent={errors.industry && touched.industry && Intent.DANGER}
+          helperText={<ErrorMessage name='industry' {...formik} />}
         >
           <InputGroup
-            medium={true}
-            intent={
-              errors.organization_industry &&
-              touched.organization_industry &&
-              Intent.DANGER
-            }
-            {...formik.getFieldProps('organization_industry')}
+            medium={'true'}
+            intent={errors.industry && touched.industry && Intent.DANGER}
+            {...formik.getFieldProps('industry')}
           />
         </FormGroup>
 
@@ -187,26 +205,22 @@ function GeneralPreferences(props) {
             Classes.FILL
           )}
           inline={true}
-          helperText={<ErrorMessage name='business_location' {...formik} />}
-          intent={
-            errors.business_location &&
-            touched.business_location &&
-            Intent.DANGER
-          }
+          helperText={<ErrorMessage name='location' {...formik} />}
+          intent={errors.location && touched.location && Intent.DANGER}
         >
           <Select
             items={businessLocation}
             noResults={<MenuItem disabled={true} text='No result.' />}
             itemRenderer={businessLocationItem}
             popoverProps={{ minimal: true }}
-            onItemSelect={onItemsSelect('business_location')}
+            onItemSelect={onItemsSelect('location')}
           >
             <Button
               fill={true}
               rightIcon='caret-down'
               text={getSelectedItemLabel(
-                'business_location',
-                'Business Location'
+                'location',
+                organizationSettings.location
               )}
             />
           </Select>
@@ -235,7 +249,10 @@ function GeneralPreferences(props) {
             <Button
               fill={true}
               rightIcon='caret-down'
-              text={getSelectedItemLabel('base_currency', 'Base Currency')}
+              text={getSelectedItemLabel(
+                'base_currency',
+                organizationSettings.base_currency
+              )}
             />
           </Select>
         </FormGroup>
@@ -261,7 +278,10 @@ function GeneralPreferences(props) {
             <Button
               fill={true}
               rightIcon='caret-down'
-              text={getSelectedItemLabel('fiscal_year', 'Fiscal Year')}
+              text={getSelectedItemLabel(
+                'fiscal_year',
+                organizationSettings.fiscal_year
+              )}
             />
           </Select>
         </FormGroup>
@@ -286,11 +306,13 @@ function GeneralPreferences(props) {
           >
             <Button
               rightIcon='caret-down'
-              text={getSelectedItemLabel('language', 'English')}
+              text={getSelectedItemLabel(
+                'language',
+                organizationSettings.language
+              )}
             />
           </Select>
         </FormGroup>
-
         <FormGroup
           label={'Time Zone'}
           inline={true}
@@ -309,30 +331,30 @@ function GeneralPreferences(props) {
             valueDisplayFormat='composite'
           />
         </FormGroup>
-
         <FormGroup
           label={'Date Format'}
           inline={true}
           className={classNames(
-            'form-group--date-format',
+            'form-group--language',
             'form-group--select-list',
             Classes.FILL
           )}
-          intent={errors.date_format && touched.data_Format && Intent.DANGER}
+          intent={errors.date_format && touched.date_format && Intent.DANGER}
           helperText={<ErrorMessage name='date_format' {...formik} />}
-          minimal={true}
         >
           <Select
             items={dateFormat}
             noResults={<MenuItem disabled={true} text='No result.' />}
-            itemRenderer={data_Format}
-            popoverProps={{ minimal: true }}
+            itemRenderer={date_format}
+            popoverProp={{ minimal: true }}
             onItemSelect={onItemsSelect('date_format')}
           >
             <Button
-              fill={true}
               rightIcon='caret-down'
-              text={getSelectedItemLabel('fiscal_year', 'Fiscal Year')}
+              text={getSelectedItemLabel(
+                'date_format',
+                organizationSettings.date_format
+              )}
             />
           </Select>
         </FormGroup>
@@ -352,4 +374,4 @@ function GeneralPreferences(props) {
   );
 }
 
-export default GeneralPreferences;
+export default compose(SettingsConnect)(GeneralPreferences);
diff --git a/client/src/containers/Dashboard/Preferences/Users.js b/client/src/containers/Dashboard/Preferences/Users.js
index fc6f0d4f9..2b5ab713f 100644
--- a/client/src/containers/Dashboard/Preferences/Users.js
+++ b/client/src/containers/Dashboard/Preferences/Users.js
@@ -29,17 +29,18 @@ function UsersPreferences({
           onChange={onChangeTabs}>
           <Tab id="users" title="Users" />
           <Tab id="roles" title="Roles" />
-        </Tabs>
+     
 
         <div class="preferences__tabs-extra-actions">
           <Button
             intent={Intent.PRIMARY}
-            onClick={onClickNewUser}>New User</Button>
+            onClick={onClickNewUser}>New invite</Button>
 
           <Button
             intent={Intent.PRIMARY}
             onClick={onClickNewUser}>New Role</Button>
         </div>
+        </Tabs>
       </div>
       <PreferencesSubContent preferenceTab="users" />
     </div>
diff --git a/client/src/containers/Dashboard/Preferences/UsersList.js b/client/src/containers/Dashboard/Preferences/UsersList.js
index 9971eec5b..5eefd0b1d 100644
--- a/client/src/containers/Dashboard/Preferences/UsersList.js
+++ b/client/src/containers/Dashboard/Preferences/UsersList.js
@@ -1,10 +1,6 @@
-import React, {useState} from 'react';
-import {useAsync} from 'react-use';
-import {
-  GridComponent,
-  ColumnsDirective,
-  ColumnDirective,
-} from '@syncfusion/ej2-react-grids';
+import React, { useState, useMemo, useCallback } from 'react';
+import { useAsync } from 'react-use';
+import DataTable from 'components/DataTable';
 import {
   Alert,
   Popover,
@@ -17,9 +13,12 @@ import {
 } from '@blueprintjs/core';
 import Icon from 'components/Icon';
 import LoadingIndicator from 'components/LoadingIndicator';
-import {snakeCase} from 'lodash';
-import connector from 'connectors/UsersList.connector';
+import { snakeCase } from 'lodash';
+import UserListConnect from 'connectors/UsersList.connector';
 import AppToaster from 'components/AppToaster';
+import { compose } from 'utils';
+import DialogConnect from 'connectors/Dialog.connector';
+import DashboardConnect from 'connectors/Dashboard.connector';
 
 function UsersListPreferences({
   fetchUsers,
@@ -27,22 +26,23 @@ function UsersListPreferences({
   openDialog,
   closeDialog,
   deleteUser,
+  onFetchData,
 }) {
   const [deleteUserState, setDeleteUserState] = useState(false);
   const [inactiveUserState, setInactiveUserState] = useState(false);
 
   const asyncHook = useAsync(async () => {
-    await Promise.all([
-      fetchUsers(),
-    ]);
+    await Promise.all([fetchUsers()]);
   }, []);
 
-  const onInactiveUser = (user) => {
+  const onInactiveUser = (user) => {};
 
+  const onDeleteUser = (user) => {
+    setDeleteUserState(user);
+  };
+  const handleCancelUserDelete = () => {
+    setDeleteUserState(false);
   };
-
-  const onDeleteUser = (user) => { setDeleteUserState(user); };
-  const handleCancelUserDelete = () => { setDeleteUserState(false); };
 
   const onEditUser = (user) => () => {
     const form = Object.keys(user).reduce((obj, key) => {
@@ -51,11 +51,13 @@ function UsersListPreferences({
       return obj;
     }, {});
 
-    openDialog('user-form', { action: 'edit', user: form, });
+    openDialog('user-form', { action: 'edit', user: form });
   };
 
   const handleConfirmUserDelete = () => {
-    if (!deleteUserState) { return; }
+    if (!deleteUserState) {
+      return;
+    }
 
     deleteUser(deleteUserState.id).then((response) => {
       setDeleteUserState(false);
@@ -65,79 +67,96 @@ function UsersListPreferences({
     });
   };
 
-  const actionMenuList = (user) =>
-    (<Menu>
-      <MenuItem text="Edit User" onClick={onEditUser(user)} />
-      <MenuItem text="New Account" />
+  const actionMenuList = (user) => (
+    <Menu>
+      <MenuItem text='Edit User' onClick={onEditUser(user)} />
+      <MenuItem text='New Account' />
       <MenuDivider />
-      <MenuItem text="Inactivate User" onClick={() => onInactiveUser(user)} />
-      <MenuItem text="Delete User" onClick={() => onDeleteUser(user)} />
-    </Menu>);
+      <MenuItem text='Inactivate User' onClick={() => onInactiveUser(user)} />
+      <MenuItem text='Delete User' onClick={() => onDeleteUser(user)} />
+    </Menu>
+  );
+  console.log(usersList, 'X');
+
+  const columns = useMemo(
+    () => [
+      {
+        id: 'full_name',
+        Header: 'Full Name',
+        accessor: 'full_name',
+        width: 170,
+      },
+      {
+        id: 'email',
+        Header: 'Email',
+        accessor: 'email',
+        width: 150,
+      },
+      {
+        id: 'phone_number',
+        Header: 'Phone Number',
+        accessor: 'phone_number',
+        width: 150,
+      },
+      {
+        id: 'active',
+        Header: 'Status',
+        accessor: (user) =>
+          user.active ? <span>Active</span> : <span>Inactivate</span>,
+        width: 50,
+      },
+      {
+        id: 'actions',
+        Header: '',
+        Cell: ({ cell }) => (
+          <Popover
+            content={actionMenuList(cell.row.original)}
+            position={Position.RIGHT_TOP}
+          >
+            <Button icon={<Icon icon='ellipsis-h' />} />
+          </Popover>
+        ),
+        className: 'actions',
+        width: 50,
+      },
+    ],
+    [actionMenuList]
+  );
+
+  const handelDataTableFetchData = useCallback(() => {
+    onFetchData && onFetchData();
+  }, []);
 
-  const columns = [
-    {
-      field: '',
-      headerText: 'Avatar',
-    },
-    {
-      field: 'fullName',
-      headerText: 'Full Name',
-    },
-    {
-      field: 'email',
-      headerText: 'Email',
-    },
-    {
-      field: 'phoneNumber',
-      headerText: 'Phone Number',
-    },
-    {
-      field: '',
-      headerText: 'Status',
-      template: (user) => user.active
-        ? (<span>Active</span>) : (<span>Inactive</span>)
-    },
-    {
-      template: (user) => (
-        <Popover content={actionMenuList(user)} position={Position.RIGHT_BOTTOM}>
-          <Button icon={<Icon icon="ellipsis-h" />} />
-        </Popover>
-      ),
-    }
-  ]
   return (
-    <LoadingIndicator loading={asyncHook.loading}>
-      <GridComponent
-        dataSource={{result: usersList.results}}>
-
-        <ColumnsDirective>
-          {columns.map((column) => {
-            return (<ColumnDirective
-              field={column.field}
-              headerText={column.headerText}
-              template={column.template}
-              allowSorting={true}
-              customAttributes={column.customAttributes}
-              />);
-          })}
-        </ColumnsDirective>
-      </GridComponent>
+    <LoadingIndicator>
+      <DataTable
+        columns={columns}
+        data={usersList}
+        onFetchData={handelDataTableFetchData()}
+        manualSortBy={true}
+        expandable={false}
+      />
 
       <Alert
-        cancelButtonText="Cancel"
-        confirmButtonText="Move to Trash"
-        icon="trash"
+        cancelButtonText='Cancel'
+        confirmButtonText='Move to Trash'
+        icon='trash'
         intent={Intent.DANGER}
         isOpen={deleteUserState}
         onCancel={handleCancelUserDelete}
-        onConfirm={handleConfirmUserDelete}>
+        onConfirm={handleConfirmUserDelete}
+      >
         <p>
-        Are you sure you want to move <b>filename</b> to Trash? You will be able to restore it later,
-        but it will become private to you.
+          Are you sure you want to move <b>filename</b> to Trash? You will be
+          able to restore it later, but it will become private to you.
         </p>
       </Alert>
     </LoadingIndicator>
   );
 }
 
-export default connector(UsersListPreferences);
\ No newline at end of file
+export default compose(
+  UserListConnect,
+  DialogConnect,
+  DashboardConnect
+)(UsersListPreferences);
diff --git a/client/src/store/itemCategories/itemsCategory.type.js b/client/src/store/itemCategories/itemsCategory.type.js
index 84470100c..a9868d08e 100644
--- a/client/src/store/itemCategories/itemsCategory.type.js
+++ b/client/src/store/itemCategories/itemsCategory.type.js
@@ -2,5 +2,6 @@ export default {
   ITEMS_CATEGORY_LIST_SET: 'ITEMS_CATEGORY_LIST_SET',
   ITEMS_CATEGORY_DATA_TABLE: 'ITEMS_CATEGORY_DATA_TABLE',
   CATEGORY_DELETE: 'CATEGORY_DELETE',
-  CLEAR_CATEGORY_FORM_ERRORS: 'CLEAR_CATEGORY_FORM_ERRORS'
+  CLEAR_CATEGORY_FORM_ERRORS: 'CLEAR_CATEGORY_FORM_ERRORS',
+  CATEGORY_COUNTER:'CATEGORY_COUNTER'
 };
diff --git a/client/src/store/settings/settings.actions.js b/client/src/store/settings/settings.actions.js
index e69de29bb..608241584 100644
--- a/client/src/store/settings/settings.actions.js
+++ b/client/src/store/settings/settings.actions.js
@@ -0,0 +1,25 @@
+import ApiService from 'services/ApiService';
+import t from 'store/types';
+
+export const submitOptions = ({ form }) => {
+  return (dispatch) => {
+    return ApiService.post('options', form);
+  };
+};
+
+export const FetchOptions = ({ form }) => {
+  return (dispatch) =>
+    new Promise((resolve, reject) => {
+      ApiService.get('options')
+        .then((response) => {
+          dispatch({
+            type: t.SETTING_SET,
+            options: response.data.options,
+          });
+          resolve(response);
+        })
+        .catch((error) => {
+          reject(error);
+        });
+    });
+};
diff --git a/client/src/store/settings/settings.reducer.js b/client/src/store/settings/settings.reducer.js
index fb03fba8f..37e7c68e0 100644
--- a/client/src/store/settings/settings.reducer.js
+++ b/client/src/store/settings/settings.reducer.js
@@ -1,16 +1,16 @@
 import { createReducer } from '@reduxjs/toolkit';
 import t from 'store/types';
-
+import { optionsArrayToMap } from 'utils';
 const initialState = {
   data: {
-    organization: {
-      name: 'Bigcapital, Limited Liabilities',
-    },
+    organization: {},
   },
 };
 
 export default createReducer(initialState, {
-  ['asdfas']: (state, action) => {
-    
+  [t.SETTING_SET]: (state, action) => {
+    const { options } = action;
+
+    state.data.organization = optionsArrayToMap(options);
   },
-});
\ No newline at end of file
+});
diff --git a/client/src/store/settings/settings.type.js b/client/src/store/settings/settings.type.js
index 7a62d56e8..fac8d63a5 100644
--- a/client/src/store/settings/settings.type.js
+++ b/client/src/store/settings/settings.type.js
@@ -1,5 +1,5 @@
-
-
 export default {
-
-};
\ No newline at end of file
+  SETTING_LIST_SET: 'SETTING_LIST_SET',
+  CLEAR_OPTIONS_FORM_ERRORS: 'CLEAR_OPTIONS_FORM_ERRORS',
+  SETTING_SET: 'SETTING_SET',
+};
diff --git a/client/src/store/users/users.reducer.js b/client/src/store/users/users.reducer.js
index d897d0d63..4c28ddc67 100644
--- a/client/src/store/users/users.reducer.js
+++ b/client/src/store/users/users.reducer.js
@@ -1,8 +1,10 @@
-import { createReducer } from "@reduxjs/toolkit";
+import { createReducer } from '@reduxjs/toolkit';
 import t from 'store/types';
 
 const initialState = {
-  list: {},
+  list: {
+    results: [],
+  },
   userById: {},
 };
 
@@ -14,13 +16,13 @@ export default createReducer(initialState, {
   [t.USER_DETAILS_SET]: (state, action) => {
     state.userById[action.user.id] = action.user;
   },
-})
+});
 
 /**
  * Retrieve the user details of the given user id,
- * @param {Object} state 
- * @param {Numeric} id 
+ * @param {Object} state
+ * @param {Numeric} id
  */
 export const getUserDetails = (state, id) => {
   return state.users.userById[id];
-};
\ No newline at end of file
+};
diff --git a/client/src/style/App.scss b/client/src/style/App.scss
index 27eef9ca4..ba4bb6ca8 100644
--- a/client/src/style/App.scss
+++ b/client/src/style/App.scss
@@ -1,9 +1,9 @@
+@import './normalize.scss';
 
-@import "./normalize.scss";
+$pt-popover-box-shadow: 0 0 0 1px rgba(16, 22, 26, 0.02),
+  0 2px 4px rgba(16, 22, 26, 0.1), 0 8px 24px rgba(16, 22, 26, 0.1);
 
-$pt-popover-box-shadow: 0 0 0 1px rgba(16, 22, 26, 0.02), 0 2px 4px rgba(16, 22, 26, 0.1), 0 8px 24px rgba(16, 22, 26, 0.1);
-
-@import "@blueprintjs/core/src/common/_variables.scss";
+@import '@blueprintjs/core/src/common/_variables.scss';
 // @import "@blueprintjs/core/src/common/colors.scss";
 
 $menu-item-color-hover: $light-gray4;
@@ -12,41 +12,43 @@ $menu-item-color-active: $light-gray3;
 $breadcrumbs-collapsed-icon: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='#6B8193' enable-background='new 0 0 16 16' xml:space='preserve'><g><circle cx='2' cy='8.03' r='2'/><circle cx='14' cy='8.03' r='2'/><circle cx='8' cy='8.03' r='2'/></g></svg>");
 
 // Blueprint framework.
-@import "@blueprintjs/core/src/blueprint.scss";
-@import "@blueprintjs/datetime/src/blueprint-datetime.scss";
+@import '@blueprintjs/core/src/blueprint.scss';
+@import '@blueprintjs/datetime/src/blueprint-datetime.scss';
 
-@import "basscss";
+@import 'basscss';
 
-$pt-font-family: Noto Sans, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Open Sans, Helvetica Neue, Icons16, sans-serif;
+$pt-font-family: Noto Sans, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto,
+  Oxygen, Ubuntu, Cantarell, Open Sans, Helvetica Neue, Icons16, sans-serif;
 
-@import "functions";
+@import 'functions';
 
 // Objects
-@import "objects/form";
-@import "objects/typography";
-@import "objects/buttons";
+@import 'objects/form';
+@import 'objects/typography';
+@import 'objects/buttons';
 
 // Components
-@import "components/data-table";
-@import "components/dialog";
-  
+@import 'components/data-table';
+@import 'components/dialog';
+
 // Pages
-@import "pages/dashboard";
-@import "pages/accounts-chart";
-@import "pages/authentication";
-@import "pages/expense-form";
-@import "pages/financial-statements";
-@import "pages/make-journal-entries";
-@import "pages/preferences";
-@import "pages/view-form";
-@import "pages/manual-journals";
-@import "pages/item-category";
-@import "pages/items";
+@import 'pages/dashboard';
+@import 'pages/accounts-chart';
+@import 'pages/authentication';
+@import 'pages/expense-form';
+@import 'pages/financial-statements';
+@import 'pages/make-journal-entries';
+@import 'pages/preferences';
+@import 'pages/view-form';
+@import 'pages/manual-journals';
+@import 'pages/item-category';
+@import 'pages/items';
+@import 'pages/invite-form.scss';
 
 // Views
-@import "views/filter-dropdown";
-@import "views/sidebar";
+@import 'views/filter-dropdown';
+@import 'views/sidebar';
 
-.#{$ns}-tooltip{
+.#{$ns}-tooltip {
   box-shadow: none;
-}
\ No newline at end of file
+}
diff --git a/client/src/style/pages/invite-form.scss b/client/src/style/pages/invite-form.scss
new file mode 100644
index 000000000..054bfe527
--- /dev/null
+++ b/client/src/style/pages/invite-form.scss
@@ -0,0 +1,47 @@
+// .dialog--invite-form {
+
+// }
+
+.dialog--invite-form {
+  &.bp3-dialog {
+    width: 400px;
+  }
+  &:not(.dialog--loading) .bp3-dialog-body {
+    margin-bottom: 25px;
+  }
+  .bp3-dialog-body {
+    // margin-right: 50px;
+    .bp3-form-group.bp3-inline {
+      .bp3-label {
+        min-width: 70px;
+      }
+
+      &.form-group--email {
+        .bp3-form-content {
+          width: 250px;
+        }
+      }
+    }
+    .bp3-dialog-footer-actions {
+      margin-right: 30px;
+      display: flex;
+      justify-content: flex-end;
+    }
+  }
+}
+
+// .bp3-dialog-body {
+//   .bp3-form-group.bp3-inline {
+//     .bp3-label {
+//       min-width: 100px;
+//     }
+//     .bp3-form-content {
+//       width: 250px;
+//     }
+//   }
+// }
+// .bp3-dialog-footer-actions {
+//   display: flex;
+//   justify-content: flex-end;
+//   margin-right: 100px;
+// }
diff --git a/client/src/style/pages/preferences.scss b/client/src/style/pages/preferences.scss
index 31f544205..39459d673 100644
--- a/client/src/style/pages/preferences.scss
+++ b/client/src/style/pages/preferences.scss
@@ -90,3 +90,7 @@
     }
   }
 }
+.preferences__tabs-extra-actions {
+  position: absolute;
+  right: 0;
+}
diff --git a/client/src/style/views/Sidebar.scss b/client/src/style/views/Sidebar.scss
index 974829987..05e3c74c5 100644
--- a/client/src/style/views/Sidebar.scss
+++ b/client/src/style/views/Sidebar.scss
@@ -1,117 +1,191 @@
-
-$sidebar-background: #01194E;
+$sidebar-background: #01194e;
 $sidebar-text-color: #fff;
 $sidebar-width: 220px;
 $sidebar-menu-item-color: #b8c0d5;
 
 $sidebar-popover-submenu-bg: rgb(1, 20, 62);
+.ScrollbarsCustom {
+  position: 'relative';
+  width: 100%;
+  height: 100%;
+}
 
-.sidebar{
+.ScrollbarsCustom-Wrapper {
+  position: 'absolute';
+  top: 0;
+  left: 0;
+  bottom: 0;
+  right: 0;
+}
+
+.ScrollbarsCustom-Content {
+  box-sizing: 'border-box';
+}
+
+.ScrollbarsCustom-Track {
+  &.ScrollbarsCustom-TrackY,
+  &.ScrollbarsCustom-TrackX {
+    position: absolute;
+    overflow: hidden;
+    border-radius: 4px;
+    background: rgba(0, 0, 0, 0.1);
+    user-select: none;
+  }
+  &.ScrollbarsCustom-TrackX {
+    height: 10px;
+    width: calc(100% - 20px);
+    bottom: 0;
+    left: 10px;
+  }
+  &.ScrollbarsCustom-TrackY {
+    width: 10px;
+    height: calc(100% - 20px);
+    top: 10px;
+  }
+}
+.ScrollbarsCustom-Thumb {
+  &.ScrollbarsCustom-ThumbX,
+  &.ScrollbarsCustom-ThumbY {
+    cursor: pointer;
+    border-radius: 4px;
+    background: rgba(255, 0, 0, 1);
+  }
+  &.ScrollbarsCustom-ThumbX {
+    height: 100%;
+    width: 0px;
+  }
+  &.ScrollbarsCustom-ThumbY {
+    height: 100%;
+    width: 0px;
+  }
+}
+.sidebar {
   background: $sidebar-background;
   color: $sidebar-text-color;
   width: $sidebar-width;
   position: fixed;
   height: 100%;
 
-  &__inner{
-    overflow-y: scroll;
-    overflow-x: hidden;
-    height: 100%;
+  // ::-webkit-scrollbar {
+  //   width: 14px;
+  //   background: transparent;
+  // }
+  // ::-webkit-scrollbar-thumb {
+  //   background-clip: content-box;
+  //   border: 4px solid transparent;
+  //   border-radius: 7px;
+  //   box-shadow: inset 0 0 0 10px;
+  // }
+  // ::-webkit-scrollbar-button {
+  //   width: 0;
+  //   height: 0;
+  //   display: none;
+  // }
+
+  // overflow: auto;
+  // color: #ff000000;
+  // transition: color 0.3s;
+
+  &:hover {
+    color: rgba(255, 255, 255, 0.35);
   }
 
+  // &__inner {
+  //   overflow-y: scroll;
+  //   overflow-x: hidden;
+  //   height: 100%;
+  // }
 
-  &__head{
+  &__head {
     padding: 16px 10px;
-   
-    &-company-meta{
 
-      .company-name{
+    &-company-meta {
+      .company-name {
         font-size: 16px;
         font-weight: 200;
         margin-bottom: 5px;
         color: rgba(255, 255, 255, 0.75);
       }
-      .company-meta{
+      .company-meta {
         color: rgba(255, 255, 255, 0.4);
         font-size: 12px;
       }
     }
   }
 
-  &-menu{
+  &-menu {
     background: transparent;
     padding: 0;
     min-width: $sidebar-width;
     border-radius: 0;
     padding-bottom: 2rem;
 
-    .#{$ns}-menu-item{
+    .#{$ns}-menu-item {
       color: $sidebar-menu-item-color;
       border-radius: 0;
       padding: 10px 16px;
       font-size: 15px;
-      font-weight: 400; 
+      font-weight: 400;
 
       &:hover,
-      &.bp3-active{
+      &.bp3-active {
         background: #012470;
         color: #c1c9dd;
       }
       &:focus,
-      &:active{
-       background: #01143e;
+      &:active {
+        background: #01143e;
       }
 
-      > .#{$ns}-icon{
+      > .#{$ns}-icon {
         color: #767b9b;
         margin-right: 14px;
         margin-top: 0;
       }
-      > .#{$ns}-icon-caret-right{
+      > .#{$ns}-icon-caret-right {
         margin-right: -4px;
         margin-top: 3px;
         color: #42547b;
       }
     }
 
-    .#{$ns}-submenu{
-
-      .#{$ns}-collapse{
+    .#{$ns}-submenu {
+      .#{$ns}-collapse {
         border-left: 2px solid rgba(255, 255, 255, 0.15);
 
-        &-body{
+        &-body {
           background-color: rgb(11, 34, 85);
           padding-bottom: 6px;
           padding-top: 6px;
         }
 
-        .#{$ns}-menu-item{
+        .#{$ns}-menu-item {
           padding: 7px 16px 7px 18px;
           font-size: 15px;
           color: #8a95b6;
 
           &:hover,
-          &.bp3-active{
+          &.bp3-active {
             background: transparent;
-            color: #C5CBE3;
+            color: #c5cbe3;
           }
         }
       }
-      .#{$ns}-popover{
+      .#{$ns}-popover {
         padding: 0;
 
-        &-content{
+        &-content {
           box-shadow: 0 0 0;
         }
       }
     }
-    .#{$ns}-popover-target.#{$ns}-popover-open .#{$ns}-menu-item{
+    .#{$ns}-popover-target.#{$ns}-popover-open .#{$ns}-menu-item {
       color: $sidebar-menu-item-color;
     }
-    .#{$ns}-menu-divider{
-      border-top-color: #1D366A;
-      color: #6B708C;
+    .#{$ns}-menu-divider {
+      border-top-color: #1d366a;
+      color: #6b708c;
       margin: 4px 0;
     }
   }
-}
\ No newline at end of file
+}