diff --git a/client/src/components/DataTable.js b/client/src/components/DataTable.js
index 7ad733d26..f8c63d862 100644
--- a/client/src/components/DataTable.js
+++ b/client/src/components/DataTable.js
@@ -13,6 +13,7 @@ import classnames from 'classnames';
 import { FixedSizeList } from 'react-window'
 import { ConditionalWrapper } from 'utils';
 import { useUpdateEffect } from 'hooks';
+import { If } from 'components';
 
 const IndeterminateCheckbox = React.forwardRef(
   ({ indeterminate, ...rest }, ref) => {
@@ -257,16 +258,19 @@ export default function DataTable({
           ))}
         </div>
         <div {...getTableBodyProps()} className="tbody">
-          { !loading && RenderTBody() }
-
-          { !loading && (page.length === 0) && (
+          <If condition={!loading}>
+            { RenderTBody() }
+          </If>
+          
+          <If condition={!loading && (page.length === 0)}>
             <div className={'tr no-results'}>
               <div class="td">{ noResults }</div>
             </div>
-          )}
-          { loading && (
+          </If>
+
+          <If condition={loading}>
             <div class="loading"><Spinner size={spinnerProps.size} /></div>
-          ) }
+          </If>
         </div>
       </div>
     </div>
diff --git a/client/src/components/Preferences/PreferencesContent.js b/client/src/components/Preferences/PreferencesContent.js
index 33fad9d86..dd19013fe 100644
--- a/client/src/components/Preferences/PreferencesContent.js
+++ b/client/src/components/Preferences/PreferencesContent.js
@@ -1,8 +1,10 @@
 import React from 'react';
+
 import PreferencesTopbar from 'components/Preferences/PreferencesTopbar';
 import PreferencesContentRoute from 'components/Preferences/PreferencesContentRoute';
 
-export default function () {
+
+export default function PreferencesContent() {
   return (
     <div className='dashboard-content dashboard-content--preferences'>
       <PreferencesTopbar pageTitle={'asdad'} />
diff --git a/client/src/components/Preferences/PreferencesContentRoute.js b/client/src/components/Preferences/PreferencesContentRoute.js
index 127a1a167..fcf0fa0aa 100644
--- a/client/src/components/Preferences/PreferencesContentRoute.js
+++ b/client/src/components/Preferences/PreferencesContentRoute.js
@@ -2,6 +2,7 @@ import React from 'react';
 import { Route, Switch, Redirect } from 'react-router-dom';
 import preferencesRoutes from 'routes/preferences'
 
+
 export default function DashboardContentRoute() {
   const defaultTab = '/dashboard/preferences/general';
 
diff --git a/client/src/components/Preferences/PreferencesPage.js b/client/src/components/Preferences/PreferencesPage.js
index 4689231c6..7cdfb59c6 100644
--- a/client/src/components/Preferences/PreferencesPage.js
+++ b/client/src/components/Preferences/PreferencesPage.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import PreferencesSidebar from 'components/Preferences/PreferencesSidebar';
 
+
 export default function PreferencesPage() {
   return (
     <div class="preferences-page">
diff --git a/client/src/components/Preferences/PreferencesTopbar.js b/client/src/components/Preferences/PreferencesTopbar.js
index 829d170e7..605d5577f 100644
--- a/client/src/components/Preferences/PreferencesTopbar.js
+++ b/client/src/components/Preferences/PreferencesTopbar.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import { Route, Switch } from 'react-router-dom';
 import DashboardTopbarUser from 'components/Dashboard/TopbarUser';
-import UsersActions from 'containers/Preferences/UsersActions';
-import CurrenciesActions from 'containers/Preferences/CurrenciesActions';
+import UsersActions from 'containers/Preferences/Users/UsersActions';
+import CurrenciesActions from 'containers/Preferences/Currencies/CurrenciesActions';
 
 
 export default function PreferencesTopbar() {
diff --git a/client/src/connectors/ManualJournals.connect.js b/client/src/connectors/ManualJournals.connect.js
deleted file mode 100644
index 6f543ce54..000000000
--- a/client/src/connectors/ManualJournals.connect.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import { connect } from 'react-redux';
-import {
-  deleteManualJournal,
-  fetchManualJournalsTable,
-  publishManualJournal,
-  deleteBulkManualJournals,
-} from 'store/manualJournals/manualJournals.actions';
-import { getResourceViews } from 'store/customViews/customViews.selectors';
-import t from 'store/types';
-import {
-  getManualJournalsItems,
-} from 'store/manualJournals/manualJournals.selectors'
-
-const mapStateToProps = (state, props) => ({
-  views: getResourceViews(state, 'manual_journals'),
-  manualJournals: getManualJournalsItems(state, state.manualJournals.currentViewId),
-  manualJournalsItems: state.manualJournals.items,
-  tableQuery: state.manualJournals.tableQuery,
-  manualJournalsLoading: state.manualJournals.loading,
-});
-
-const mapActionsToProps = (dispatch) => ({
-  requestDeleteManualJournal: (id) => dispatch(deleteManualJournal({ id })),
-  changeCurrentView: (id) =>
-    dispatch({
-      type: t.MANUAL_JOURNALS_SET_CURRENT_VIEW,
-      currentViewId: parseInt(id, 10),
-    }),
-  addManualJournalsTableQueries: (queries) =>
-    dispatch({
-      type: t.MANUAL_JOURNALS_TABLE_QUERIES_ADD,
-      queries,
-    }),
-  fetchManualJournalsTable: (query = {}) =>
-    dispatch(fetchManualJournalsTable({ query: { ...query } })),
-
-  requestPublishManualJournal: (id) => dispatch(publishManualJournal({ id })),
-  requestDeleteBulkManualJournals: (ids) => dispatch(deleteBulkManualJournals({ ids })),
-});
-
-export default connect(mapStateToProps, mapActionsToProps);
diff --git a/client/src/containers/Currencies/withCurrencies.js b/client/src/containers/Currencies/withCurrencies.js
new file mode 100644
index 000000000..f672e6470
--- /dev/null
+++ b/client/src/containers/Currencies/withCurrencies.js
@@ -0,0 +1,13 @@
+import { connect } from 'react-redux';
+
+export default (mapState) => {  
+  const mapStateToProps = (state, props) => {
+    const mapped = {
+      currencies: state.currencies.data,
+      currenciesList: Object.values(state.currencies.data),
+    };
+    return mapState ? mapState(mapped, state, props) : mapped;
+  };
+  
+  return connect(mapStateToProps);
+}
diff --git a/client/src/containers/Currencies/withCurrenciesActions.js b/client/src/containers/Currencies/withCurrenciesActions.js
new file mode 100644
index 000000000..e835bebbc
--- /dev/null
+++ b/client/src/containers/Currencies/withCurrenciesActions.js
@@ -0,0 +1,17 @@
+import { connect } from 'react-redux';
+import {
+  fetchCurrencies,
+  submitCurrencies,
+  deleteCurrency,
+  editCurrency,
+} from 'store/currencies/currencies.actions';
+
+
+export const mapDispatchToProps = (dispatch) => ({
+  requestFetchCurrencies: () => dispatch(fetchCurrencies({})),
+  requestSubmitCurrencies: (form) => dispatch(submitCurrencies({ form })),
+  requestEditCurrency: (id, form) => dispatch(editCurrency({ id, form })),
+  requestDeleteCurrency: (currency_code) => dispatch(deleteCurrency({ currency_code })),
+});
+
+export default connect(null, mapDispatchToProps);
diff --git a/client/src/containers/Currencies/withCurrency.js b/client/src/containers/Currencies/withCurrency.js
new file mode 100644
index 000000000..cb38db924
--- /dev/null
+++ b/client/src/containers/Currencies/withCurrency.js
@@ -0,0 +1,16 @@
+import { connect } from 'react-redux';
+import {
+  getCurrencyById,
+  getCurrencyByCode,
+} from 'store/currencies/currencies.selector';
+
+
+const mapStateToProps = (state, props) => ({
+  ...(props.currencyId) ? {
+    currency: getCurrencyById(state.currencies.data, props.currencyId),
+  } : (props.currencyCode) ? {
+    currency: getCurrencyByCode(state.currencies.data, props.currencyCode),
+  } : {},
+});
+
+export default connect(mapStateToProps);
\ No newline at end of file
diff --git a/client/src/containers/Dialogs/CurrencyDialog.js b/client/src/containers/Dialogs/CurrencyDialog.js
index e5d6e4b93..5688b46e2 100644
--- a/client/src/containers/Dialogs/CurrencyDialog.js
+++ b/client/src/containers/Dialogs/CurrencyDialog.js
@@ -1,4 +1,4 @@
-import React, { useState, useMemo, useCallback } from 'react';
+import React, { useMemo, useCallback } from 'react';
 import {
   Button,
   Classes,
@@ -9,26 +9,40 @@ import {
 import * as Yup from 'yup';
 import { useIntl } from 'react-intl';
 import { useFormik } from 'formik';
+import { useQuery } from 'react-query';
+import { connect } from 'react-redux';
+
 import { compose } from 'utils';
 import Dialog from 'components/Dialog';
-import useAsync from 'hooks/async';
+
 import AppToaster from 'components/AppToaster';
 import DialogConnect from 'connectors/Dialog.connector';
 import DialogReduxConnect from 'components/DialogReduxConnect';
-import CurrencyFromDialogConnect from 'connectors/CurrencyFromDialog.connect';
+import withCurrency from 'containers/Currencies/withCurrency';
+import withCurrenciesActions from 'containers/Currencies/withCurrenciesActions';
+
 import ErrorMessage from 'components/ErrorMessage';
 import classNames from 'classnames';
 import { pick } from 'lodash';
+import { getDialogPayload } from 'store/dashboard/dashboard.reducer';
+
 
 function CurrencyDialog({
   name,
   payload,
   isOpen,
+
+  // #withDialog
   closeDialog,
+
+  // #withCurrency
+  currencyCode,
+  currency,
+
+  // #wihtCurrenciesActions
   requestFetchCurrencies,
   requestSubmitCurrencies,
   requestEditCurrency,
-  editCurrency,
 }) {
   const intl = useIntl();
 
@@ -40,70 +54,72 @@ function CurrencyDialog({
       .max(4)
       .required(intl.formatMessage({ id: 'required' })),
   });
-  const initialValues = useMemo(
-    () => ({
-      currency_name: '',
-      currency_code: '',
-    }),
-    []
-  );
+  const initialValues = useMemo(() => ({
+    currency_name: '',
+    currency_code: '',
+  }), []);
 
-  const formik = useFormik({
+  const {
+    values, 
+    errors,
+    touched,
+    setFieldValue,
+    getFieldProps,
+    isSubmitting,
+    handleSubmit,
+    resetForm,
+  } = useFormik({
     enableReinitialize: true,
-
     initialValues: {
       ...(payload.action === 'edit' &&
-        pick(editCurrency, Object.keys(initialValues))),
+        pick(currency, Object.keys(initialValues))),
     },
-
     validationSchema: ValidationSchema,
     onSubmit: (values, { setSubmitting }) => {
       if (payload.action === 'edit') {
-        requestEditCurrency(editCurrency.id, values)
-          .then((response) => {
-            closeDialog(name);
-            AppToaster.show({
-              message: 'the_currency_has_been_edited',
-            });
-            setSubmitting(false);
-          })
-          .catch((error) => {
-            setSubmitting(false);
+        requestEditCurrency(currency.id, values).then((response) => {
+          closeDialog(name);
+          AppToaster.show({
+            message: 'the_currency_has_been_edited',
+            intent: Intent.SUCCESS,
           });
+          setSubmitting(false);
+        })
+        .catch((error) => {
+          setSubmitting(false);
+        });
       } else {
-        requestSubmitCurrencies(values)
-          .then((response) => {
-            closeDialog(name);
-            AppToaster.show({
-              message: 'the_currency_has_been_submit',
-            });
-            setSubmitting(false);
-          })
-          .catch((error) => {
-            setSubmitting(false);
+        requestSubmitCurrencies(values).then((response) => {
+          closeDialog(name);
+          AppToaster.show({
+            message: 'the_currency_has_been_submit',
+            intent: Intent.SUCCESS,
           });
+          setSubmitting(false);
+        })
+        .catch((error) => {
+          setSubmitting(false);
+        });
       }
     },
   });
 
-  const { values, errors, touched } = useMemo(() => formik, [formik]);
-
   const handleClose = useCallback(() => {
     closeDialog(name);
   }, [name, closeDialog]);
 
-  const fetchHook = useAsync(async () => {
-    await Promise.all([requestFetchCurrencies()]);
-  });
+  const fetchCurrencies = useQuery('currencies',
+    () => { requestFetchCurrencies(); },
+    { manual: true });
 
   const onDialogOpening = useCallback(() => {
-    fetchHook.execute();
-  }, [fetchHook]);
+    fetchCurrencies.refetch();
+  }, [fetchCurrencies]);
 
   const onDialogClosed = useCallback(() => {
-    formik.resetForm();
+    resetForm();
     closeDialog(name);
-  }, [formik, closeDialog, name]);
+  }, [closeDialog, name]);
 
   const requiredSpan = useMemo(() => <span className={'required'}>*</span>, []);
 
@@ -113,59 +129,53 @@ function CurrencyDialog({
       title={payload.action === 'edit' ? 'Edit Currency' : ' New Currency'}
       className={classNames(
         {
-          'dialog--loading': fetchHook.pending,
+          'dialog--loading': fetchCurrencies.isFetching,
         },
         'dialog--currency-form'
       )}
       isOpen={isOpen}
       onClosed={onDialogClosed}
       onOpening={onDialogOpening}
-      isLoading={fetchHook.pending}
+      isLoading={fetchCurrencies.isFetching}
       onClose={handleClose}
     >
-      <form onSubmit={formik.handleSubmit}>
+      <form onSubmit={handleSubmit}>
         <div className={Classes.DIALOG_BODY}>
           <FormGroup
             label={'Currency Name'}
             labelInfo={requiredSpan}
             className={'form-group--currency-name'}
-            intent={
-              errors.currency_name && touched.currency_name && Intent.DANGER
-            }
-            helperText={<ErrorMessage name='currency_name' {...formik} />}
+            intent={(errors.currency_name && touched.currency_name) && Intent.DANGER}
+            helperText={<ErrorMessage name='currency_name' {...{errors, touched}} />}
             inline={true}
           >
             <InputGroup
               medium={true}
-              intent={
-                errors.currency_name && touched.currency_name && Intent.DANGER
-              }
-              {...formik.getFieldProps('currency_name')}
+              intent={(errors.currency_name && touched.currency_name) && Intent.DANGER}
+              {...getFieldProps('currency_name')}
             />
           </FormGroup>
+
           <FormGroup
             label={'Currency Code'}
             labelInfo={requiredSpan}
             className={'form-group--currency-code'}
-            intent={
-              errors.currency_code && touched.currency_code && Intent.DANGER
-            }
-            helperText={<ErrorMessage name='currency_code' {...formik} />}
+            intent={(errors.currency_code && touched.currency_code) && Intent.DANGER}
+            helperText={<ErrorMessage name='currency_code' {...{errors, touched}} />}
             inline={true}
           >
             <InputGroup
               medium={true}
-              intent={
-                errors.currency_code && touched.currency_code && Intent.DANGER
-              }
-              {...formik.getFieldProps('currency_code')}
+              intent={(errors.currency_code && touched.currency_code) && Intent.DANGER}
+              {...getFieldProps('currency_code')}
             />
           </FormGroup>
         </div>
+
         <div className={Classes.DIALOG_FOOTER}>
           <div className={Classes.DIALOG_FOOTER_ACTIONS}>
             <Button onClick={handleClose}>Close</Button>
-            <Button intent={Intent.PRIMARY} type='submit'>
+            <Button intent={Intent.PRIMARY} type='submit' disabled={isSubmitting}>
               {payload.action === 'edit' ? 'Edit' : 'Submit'}
             </Button>
           </div>
@@ -175,8 +185,22 @@ function CurrencyDialog({
   );
 }
 
+const mapStateToProps = (state, props) => {
+  const dialogPayload = getDialogPayload(state, 'currency-form');
+
+  return {
+    name: 'currency-form',
+    payload: { action: 'new', currencyCode: null, ...dialogPayload },
+    currencyCode: dialogPayload?.currencyCode || null,
+  }
+}
+
+const withCurrencyFormDialog = connect(mapStateToProps);
+
 export default compose(
-  CurrencyFromDialogConnect,
+  withCurrencyFormDialog,
   DialogConnect,
-  DialogReduxConnect
+  DialogReduxConnect,
+  withCurrenciesActions,
+  withCurrency,
 )(CurrencyDialog);
diff --git a/client/src/containers/Preferences/Accountant.js b/client/src/containers/Preferences/Accountant/Accountant.js
similarity index 100%
rename from client/src/containers/Preferences/Accountant.js
rename to client/src/containers/Preferences/Accountant/Accountant.js
diff --git a/client/src/containers/Preferences/Accounts.js b/client/src/containers/Preferences/Accounts/Accounts.js
similarity index 100%
rename from client/src/containers/Preferences/Accounts.js
rename to client/src/containers/Preferences/Accounts/Accounts.js
diff --git a/client/src/containers/Preferences/AccountsCustomFields.js b/client/src/containers/Preferences/Accounts/AccountsCustomFields.js
similarity index 100%
rename from client/src/containers/Preferences/AccountsCustomFields.js
rename to client/src/containers/Preferences/Accounts/AccountsCustomFields.js
diff --git a/client/src/containers/Preferences/AccountsGeneral.js b/client/src/containers/Preferences/Accounts/AccountsGeneral.js
similarity index 100%
rename from client/src/containers/Preferences/AccountsGeneral.js
rename to client/src/containers/Preferences/Accounts/AccountsGeneral.js
diff --git a/client/src/containers/Preferences/Currencies.js b/client/src/containers/Preferences/Currencies/Currencies.js
similarity index 100%
rename from client/src/containers/Preferences/Currencies.js
rename to client/src/containers/Preferences/Currencies/Currencies.js
diff --git a/client/src/containers/Preferences/CurrenciesActions.js b/client/src/containers/Preferences/Currencies/CurrenciesActions.js
similarity index 100%
rename from client/src/containers/Preferences/CurrenciesActions.js
rename to client/src/containers/Preferences/Currencies/CurrenciesActions.js
diff --git a/client/src/containers/Preferences/CurrenciesList.js b/client/src/containers/Preferences/Currencies/CurrenciesList.js
similarity index 52%
rename from client/src/containers/Preferences/CurrenciesList.js
rename to client/src/containers/Preferences/Currencies/CurrenciesList.js
index 6554f56e7..8572ef696 100644
--- a/client/src/containers/Preferences/CurrenciesList.js
+++ b/client/src/containers/Preferences/Currencies/CurrenciesList.js
@@ -4,41 +4,53 @@ import {
   Popover,
   Menu,
   MenuItem,
-  MenuDivider,
   Position,
-  Classes,
-  Tooltip,
   Alert,
   Intent,
 } from '@blueprintjs/core';
+import { useQuery } from 'react-query';
+
 import Icon from 'components/Icon';
-import { snakeCase } from 'lodash';
 import { compose } from 'utils';
-import CurrencyFromDialogConnect from 'connectors/CurrencyFromDialog.connect';
 import DialogConnect from 'connectors/Dialog.connector';
-import DashboardConnect from 'connectors/Dashboard.connector';
+
 import LoadingIndicator from 'components/LoadingIndicator';
 import DataTable from 'components/DataTable';
 import AppToaster from 'components/AppToaster';
 
+import withDashboard from 'connectors/Dashboard.connector';
+import withCurrencies from 'containers/Currencies/withCurrencies';
+import withCurrenciesActions from 'containers/Currencies/withCurrenciesActions';
+
+
 function CurrenciesList({
-  currencies,
+  // #withCurrencies
+  currenciesList,
+
+  // #withCurrenciesActions
+  requestDeleteCurrency,
+  requestFetchCurrencies,
+
+  // #withDialog
   openDialog,
   onFetchData,
-  requestDeleteCurrency,
 }) {
   const [deleteCurrencyState, setDeleteCurrencyState] = useState(false);
 
-  const handleEditCurrency = (currency) => () => {
+  const fetchCurrencies = useQuery(['currencies-table'],
+    () => requestFetchCurrencies());
+
+  const handleEditCurrency = (currency) => {
     openDialog('currency-form', {
       action: 'edit',
-      currency_code: currency.currency_code,
+      currencyCode: currency.currency_code,
     });
   };
 
   const onDeleteCurrency = (currency) => {
     setDeleteCurrencyState(currency);
   };
+
   const handleCancelCurrencyDelete = () => {
     setDeleteCurrencyState(false);
   };
@@ -54,56 +66,51 @@ function CurrenciesList({
     );
   }, [deleteCurrencyState]);
 
-  const actionMenuList = useCallback(
-    (currency) => (
-      <Menu>
-        <MenuItem text='Edit Currency' onClick={handleEditCurrency(currency)} />
+  const actionMenuList = useCallback((currency) => (
+    <Menu>
+      <MenuItem
+        text='Edit Currency'
+        onClick={() => handleEditCurrency(currency)} />
 
-        <MenuItem
-          text='Delete Currency'
-          onClick={() => onDeleteCurrency(currency)}
-        />
-      </Menu>
-    ),
-    []
-  );
+      <MenuItem
+        text='Delete Currency'
+        onClick={() => onDeleteCurrency(currency)}
+      />
+    </Menu>
+  ), []);
+
+  const columns = useMemo(() => [
+    {
+      Header: 'Currency Name',
+      accessor: 'currency_name',
+      width: 100,
+    },
+    {
+      Header: 'Currency Code',
+      accessor: 'currency_code',
+      className: 'currency_code',
+      width: 100,
+    },
+    {
+      Header: 'Currency sign',
+      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 columns = useMemo(
-    () => [
-      {
-        id: 'currency_name',
-        Header: 'Currency Name',
-        accessor: 'currency_name',
-        width: 100,
-      },
-      {
-        id: 'currency_code',
-        Header: 'Currency Code',
-        accessor: 'currency_code',
-        className: 'currency_code',
-        width: 100,
-      },
-      {
-        Header: 'Currency sign',
-        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 handleDatatableFetchData = useCallback(() => {
     onFetchData && onFetchData();
   }, []);
@@ -112,9 +119,9 @@ function CurrenciesList({
     <LoadingIndicator>
       <DataTable
         columns={columns}
-        data={Object.values(currencies)}
-        onFetchData={handleDatatableFetchData()}
-        selectionColumn={true}
+        data={currenciesList}
+        loading={fetchCurrencies.isFetching}
+        selectionColumn={false}
       />
 
       <Alert
@@ -136,7 +143,10 @@ function CurrenciesList({
 }
 
 export default compose(
-  CurrencyFromDialogConnect,
+  withCurrencies(({ currenciesList }) => ({
+    currenciesList,
+  })),
+  withCurrenciesActions,
   DialogConnect,
-  DashboardConnect
+  withDashboard
 )(CurrenciesList);
diff --git a/client/src/containers/Preferences/General.js b/client/src/containers/Preferences/General/General.js
similarity index 81%
rename from client/src/containers/Preferences/General.js
rename to client/src/containers/Preferences/General/General.js
index 2f1a8eeb2..f562453e9 100644
--- a/client/src/containers/Preferences/General.js
+++ b/client/src/containers/Preferences/General/General.js
@@ -9,27 +9,36 @@ import {
   MenuItem,
   Classes,
 } from '@blueprintjs/core';
-
-import { optionsMapToArray, momentFormatter, optionsArrayToMap } from 'utils';
+import classNames from 'classnames';
 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';
+import { useQuery } from 'react-query';
+
+import { compose, optionsMapToArray } from 'utils';
+
+import ErrorMessage from 'components/ErrorMessage';
+import AppToaster from 'components/AppToaster';
+
+import withSettings from 'containers/Settings/withSettings';
+import withSettingsActions from 'containers/Settings/withSettingsActions';
+
 
 function GeneralPreferences({
+  // #withSettings
   organizationSettings,
+
+  // #withSettingsActions
   requestSubmitOptions,
   requestFetchOptions,
 }) {
+  const intl = useIntl();
   const [selectedItems, setSelectedItems] = useState({});
   const [timeZone, setTimeZone] = useState('');
 
+  const fetchHook = useQuery(['settings'],
+    () => { requestFetchOptions(); });
+
   const businessLocation = [
     { id: 218, name: 'LIBYA', code: 'LY' },
     { id: 380, name: 'UKRAINE', code: 'UA' },
@@ -55,8 +64,6 @@ function GeneralPreferences({
     { id: 6, name: 'Saturday, Apr 11, 2020', format: 'EEEE, MMM d, yyyy' },
   ];
 
-  const intl = useIntl();
-
   const validationSchema = Yup.object().shape({
     name: Yup.string().required(intl.formatMessage({ id: 'required' })),
     industry: Yup.string().required(intl.formatMessage({ id: 'required' })),
@@ -69,15 +76,22 @@ function GeneralPreferences({
     // 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({
+  const {
+    errors,
+    values,
+    touched,
+    isSubmitting,
+    setFieldValue,
+    getFieldProps,
+    handleSubmit,
+    resetForm,
+  } = useFormik({
     enableReinitialize: true,
     initialValues: {
       ...organizationSettings,
     },
-    validationSchema: validationSchema,
-
+    validationSchema,
     onSubmit: (values, { setSubmitting }) => {
       const options = optionsMapToArray(values).map((option) => {
         return { key: option.key, ...option, group: 'organization' };
@@ -96,12 +110,6 @@ function GeneralPreferences({
     },
   });
 
-  const { errors, values, touched } = useMemo(() => formik, [formik]);
-
-  const fetchHook = useAsync(async () => {
-    await Promise.all([requestFetchOptions()]);
-  });
-
   const businessLocationItem = (item, { handleClick }) => (
     <MenuItem
       className={'preferences-menu'}
@@ -156,7 +164,7 @@ function GeneralPreferences({
         ...selectedItems,
         [filedName]: filed,
       });
-      formik.setFieldValue(filedName, filed.name);
+      setFieldValue(filedName, filed.name);
     };
   };
 
@@ -170,30 +178,30 @@ function GeneralPreferences({
 
   return (
     <div className='preferences__inside-content--general'>
-      <form onSubmit={formik.handleSubmit}>
+      <form onSubmit={handleSubmit}>
         <FormGroup
           label={'Organization Name'}
           inline={true}
-          intent={errors.name && touched.name && Intent.DANGER}
-          helperText={<ErrorMessage name='name' {...formik} />}
+          intent={(errors.name && touched.name) && Intent.DANGER}
+          helperText={<ErrorMessage name='name' {...{errors, touched}} />}
         >
           <InputGroup
             medium={'true'}
-            intent={errors.name && touched.name && Intent.DANGER}
-            {...formik.getFieldProps('name')}
+            intent={(errors.name && touched.name) && Intent.DANGER}
+            {...getFieldProps('name')}
           />
         </FormGroup>
 
         <FormGroup
           label={'Organization Industry'}
           inline={true}
-          intent={errors.industry && touched.industry && Intent.DANGER}
-          helperText={<ErrorMessage name='industry' {...formik} />}
+          intent={(errors.industry && touched.industry) && Intent.DANGER}
+          helperText={<ErrorMessage name='industry' {...{errors, touched}} />}
         >
           <InputGroup
             medium={'true'}
-            intent={errors.industry && touched.industry && Intent.DANGER}
-            {...formik.getFieldProps('industry')}
+            intent={(errors.industry && touched.industry) && Intent.DANGER}
+            {...getFieldProps('industry')}
           />
         </FormGroup>
 
@@ -205,8 +213,8 @@ function GeneralPreferences({
             Classes.FILL
           )}
           inline={true}
-          helperText={<ErrorMessage name='location' {...formik} />}
-          intent={errors.location && touched.location && Intent.DANGER}
+          helperText={<ErrorMessage name='location' {...{errors, touched}} />}
+          intent={(errors.location && touched.location) && Intent.DANGER}
         >
           <Select
             items={businessLocation}
@@ -234,10 +242,8 @@ function GeneralPreferences({
             Classes.FILL
           )}
           inline={true}
-          helperText={<ErrorMessage name='base_currency' {...formik} />}
-          intent={
-            errors.base_currency && touched.base_currency && Intent.DANGER
-          }
+          helperText={<ErrorMessage name='base_currency' {...{ errors, touched }} />}
+          intent={(errors.base_currency && touched.base_currency) && Intent.DANGER}
         >
           <Select
             items={currencies}
@@ -265,8 +271,8 @@ function GeneralPreferences({
             Classes.FILL
           )}
           inline={true}
-          helperText={<ErrorMessage name='fiscal_year' {...formik} />}
-          intent={errors.fiscal_year && touched.fiscal_year && Intent.DANGER}
+          helperText={<ErrorMessage name='fiscal_year' {...{errors, touched}} />}
+          intent={(errors.fiscal_year && touched.fiscal_year) && Intent.DANGER}
         >
           <Select
             items={fiscalYear}
@@ -294,8 +300,8 @@ function GeneralPreferences({
             'form-group--select-list',
             Classes.FILL
           )}
-          intent={errors.language && touched.language && Intent.DANGER}
-          helperText={<ErrorMessage name='language' {...formik} />}
+          intent={(errors.language && touched.language) && Intent.DANGER}
+          helperText={<ErrorMessage name='language' {...{errors, touched}} />}
         >
           <Select
             items={languagesDisplay}
@@ -321,8 +327,8 @@ function GeneralPreferences({
             'form-group--select-list',
             Classes.FILL
           )}
-          intent={errors.time_zone && touched.time_zone && Intent.DANGER}
-          helperText={<ErrorMessage name='time_zone' {...formik} />}
+          intent={(errors.time_zone && touched.time_zone) && Intent.DANGER}
+          helperText={<ErrorMessage name='time_zone' {...{errors, touched}} />}
         >
           <TimezonePicker
             value={timeZone}
@@ -339,8 +345,8 @@ function GeneralPreferences({
             'form-group--select-list',
             Classes.FILL
           )}
-          intent={errors.date_format && touched.date_format && Intent.DANGER}
-          helperText={<ErrorMessage name='date_format' {...formik} />}
+          intent={(errors.date_format && touched.date_format) && Intent.DANGER}
+          helperText={<ErrorMessage name='date_format' {...{errors, touched}} />}
         >
           <Select
             items={dateFormat}
@@ -374,4 +380,7 @@ function GeneralPreferences({
   );
 }
 
-export default compose(SettingsConnect)(GeneralPreferences);
+export default compose(
+  withSettings,
+  withSettingsActions,
+)(GeneralPreferences);
diff --git a/client/src/containers/Preferences/RolesList.js b/client/src/containers/Preferences/Users/RolesList.js
similarity index 100%
rename from client/src/containers/Preferences/RolesList.js
rename to client/src/containers/Preferences/Users/RolesList.js
diff --git a/client/src/containers/Preferences/Users.js b/client/src/containers/Preferences/Users/Users.js
similarity index 100%
rename from client/src/containers/Preferences/Users.js
rename to client/src/containers/Preferences/Users/Users.js
diff --git a/client/src/containers/Preferences/UsersActions.js b/client/src/containers/Preferences/Users/UsersActions.js
similarity index 100%
rename from client/src/containers/Preferences/UsersActions.js
rename to client/src/containers/Preferences/Users/UsersActions.js
diff --git a/client/src/containers/Preferences/UsersList.js b/client/src/containers/Preferences/Users/UsersList.js
similarity index 74%
rename from client/src/containers/Preferences/UsersList.js
rename to client/src/containers/Preferences/Users/UsersList.js
index f8f1238d1..99eddcd57 100644
--- a/client/src/containers/Preferences/UsersList.js
+++ b/client/src/containers/Preferences/Users/UsersList.js
@@ -1,5 +1,5 @@
 import React, { useState, useMemo, useCallback } from 'react';
-import { useAsync } from 'react-use';
+import { useQuery } from 'react-query';
 import DataTable from 'components/DataTable';
 import {
   Alert,
@@ -11,30 +11,42 @@ import {
   Position,
   Intent,
 } from '@blueprintjs/core';
+import { snakeCase } from 'lodash';
+
 import Icon from 'components/Icon';
 import LoadingIndicator from 'components/LoadingIndicator';
-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';
+import withDashboard from 'containers/Dashboard/withDashboard';
+import withUsers from 'containers/Users/withUsers';
+import withUsersActions from 'containers/Users/withUsersActions';
+
+import { compose } from 'utils';
+
 
 function UsersListPreferences({
-  requestFetchUsers,
-  usersList,
+  // #withDialog
   openDialog,
   closeDialog,
+
+  // #withUsers  
+  usersList,
+  
+  // #withUsersActions
   requestDeleteUser,
   requestInactiveUser,
+  requestFetchUsers,
+
+  // #ownProps
   onFetchData,
 }) {
   const [deleteUserState, setDeleteUserState] = useState(false);
   const [inactiveUserState, setInactiveUserState] = useState(false);
 
-  const asyncHook = useAsync(async () => {
-    await Promise.all([requestFetchUsers()]);
-  }, []);
+  const fetchUsers = useQuery('users-table', 
+    () => requestFetchUsers());
 
   const onInactiveUser = (user) => {
     setInactiveUserState(user);
@@ -49,7 +61,6 @@ function UsersListPreferences({
   const handleConfirmUserActive = useCallback(() => {
     requestInactiveUser(inactiveUserState.id).then(() => {
       setInactiveUserState(false);
-      requestFetchUsers();
       AppToaster.show({ message: 'the_user_has_been_inactivated' });
     });
   }, [inactiveUserState, requestInactiveUser, requestFetchUsers]);
@@ -105,50 +116,47 @@ function UsersListPreferences({
     []
   );
 
-  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 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();
@@ -160,6 +168,7 @@ function UsersListPreferences({
         columns={columns}
         data={usersList}
         onFetchData={handelDataTableFetchData()}
+        loading={fetchUsers.isFetching}
         manualSortBy={true}
         expandable={false}
       />
@@ -198,7 +207,8 @@ function UsersListPreferences({
 }
 
 export default compose(
-  UserListConnect,
   DialogConnect,
-  DashboardConnect
+  withDashboard,
+  withUsers,
+  withUsersActions,
 )(UsersListPreferences);
diff --git a/client/src/containers/Preferences/withUsers.js b/client/src/containers/Preferences/withUsers.js
deleted file mode 100644
index 9c4ec0927..000000000
--- a/client/src/containers/Preferences/withUsers.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { connect } from 'react-redux';
-
-export const mapStateToProps = (state, props) => {
-  return {
-    usersList: state.users.list.results,
-  };
-};
-
-export default connect(mapStateToProps);
diff --git a/client/src/containers/Settings/withSettings.js b/client/src/containers/Settings/withSettings.js
new file mode 100644
index 000000000..e0f9a70f9
--- /dev/null
+++ b/client/src/containers/Settings/withSettings.js
@@ -0,0 +1,7 @@
+import { connect } from 'react-redux';
+
+export const mapStateToProps = (state, props) => ({
+  organizationSettings: state.settings.data.organization,
+});
+
+export default connect(mapStateToProps);
diff --git a/client/src/containers/Settings/withSettingsActions.js b/client/src/containers/Settings/withSettingsActions.js
new file mode 100644
index 000000000..1c02035f3
--- /dev/null
+++ b/client/src/containers/Settings/withSettingsActions.js
@@ -0,0 +1,12 @@
+import { connect } from 'react-redux';
+import {
+  FetchOptions,
+  submitOptions,
+} from 'store/settings/settings.actions';
+
+export const mapDispatchToProps = (dispatch) => ({
+  requestSubmitOptions: (form) => dispatch(submitOptions({ form })),
+  requestFetchOptions: () => dispatch(FetchOptions({})),
+});
+
+export default connect(null, mapDispatchToProps);
diff --git a/client/src/containers/Users/withUsers.js b/client/src/containers/Users/withUsers.js
new file mode 100644
index 000000000..09f269a4e
--- /dev/null
+++ b/client/src/containers/Users/withUsers.js
@@ -0,0 +1,7 @@
+import { connect } from 'react-redux';
+
+export const mapStateToProps = (state, props) => ({
+  usersList: state.users.list.results,
+});
+
+export default connect(mapStateToProps);
diff --git a/client/src/containers/Preferences/withUsersActions.js b/client/src/containers/Users/withUsersActions.js
similarity index 100%
rename from client/src/containers/Preferences/withUsersActions.js
rename to client/src/containers/Users/withUsersActions.js
diff --git a/client/src/routes/authentication.js b/client/src/routes/authentication.js
index 87acb3d4d..0940781cc 100644
--- a/client/src/routes/authentication.js
+++ b/client/src/routes/authentication.js
@@ -5,35 +5,30 @@ const BASE_URL = '/auth';
 export default [
   {
     path: `${BASE_URL}/login`,
-    name: 'auth.login',
     component: LazyLoader({
       loader: () => import('containers/Authentication/Login'),
     }),
   },
   {
     path: `${BASE_URL}/register`,
-    name: 'auth.register',
     component: LazyLoader({
     loader: () => import('containers/Authentication/Register'),
     }),
   },
   {
     path: `${BASE_URL}/send_reset_password`,
-    name: 'auth.reset_password',
     component: LazyLoader({
       loader: () => import('containers/Authentication/SendResetPassword'),
     }),
   },
   {
     path: `${BASE_URL}/reset_password/:token`,
-    name: 'auth.send.reset_password',
     component: LazyLoader({
       loader: () => import('containers/Authentication/ResetPassword'),
     }),
   },
   {
     path: `${BASE_URL}/invite/:token/accept`,
-    name: 'auth.invite.accept',
     component: LazyLoader({
       loader: () => import('containers/Authentication/InviteAccept'),
     }),
diff --git a/client/src/routes/preferences.js b/client/src/routes/preferences.js
index 1832e06f3..7439409c7 100644
--- a/client/src/routes/preferences.js
+++ b/client/src/routes/preferences.js
@@ -1,21 +1,19 @@
-import General from 'containers/Preferences/General';
-import Users from 'containers/Preferences/Users';
-import Accountant from 'containers/Preferences/Accountant';
-import Accounts from 'containers/Preferences/Accounts';
-import CurrenciesList from 'containers/Preferences/CurrenciesList'
+import General from 'containers/Preferences/General/General';
+import Users from 'containers/Preferences/Users/Users';
+import Accountant from 'containers/Preferences/Accountant/Accountant';
+import Accounts from 'containers/Preferences/Accounts/Accounts';
+import CurrenciesList from 'containers/Preferences/Currencies/CurrenciesList'
 
 const BASE_URL = '/dashboard/preferences';
 
 export default [
   {
     path: `${BASE_URL}/general`,
-    name: 'dashboard.preferences.general',
     component: General,
     exact: true,
   },
   {
     path: `${BASE_URL}/users`,
-    name: 'dashboard.preferences.users',
     component: Users,
     exact: true,
   },
@@ -26,13 +24,11 @@ export default [
   },
   {
     path: `${BASE_URL}/accountant`,
-    name: 'dashboard.preferences.accountant',
     component: Accountant,
     exact: true,
   },
   {
     path: `${BASE_URL}/accounts`,
-    name: 'dashboard.preferences.accounts',
     component: Accounts,
   },
 ];
diff --git a/client/src/routes/preferencesTabs.js b/client/src/routes/preferencesTabs.js
index 51e917754..48537aa24 100644
--- a/client/src/routes/preferencesTabs.js
+++ b/client/src/routes/preferencesTabs.js
@@ -1,20 +1,19 @@
-import AccountsCustomFields from "containers/Preferences/AccountsCustomFields";
-import UsersList from 'containers/Preferences/UsersList';
-import RolesList from 'containers/Preferences/RolesList';
+// import AccountsCustomFields from "containers/Preferences/AccountsCustomFields";
+import UsersList from 'containers/Preferences/Users/UsersList';
+import RolesList from 'containers/Preferences/Users/RolesList';
 
 export default {
   accounts: [
-    {
-      path: '',
-      component: AccountsCustomFields,
-      exact: true,
-    },
-    {
-      name: 'dashboard.preferences.accounts.custom_fields',
-      path: 'custom_fields',
-      component: AccountsCustomFields,
-      exact: true,
-    },
+    // {
+    //   path: '',
+    //   component: AccountsCustomFields,
+    //   exact: true,
+    // },
+    // {
+    //   path: 'custom_fields',
+    //   component: AccountsCustomFields,
+    //   exact: true,
+    // },
   ],
   users: [
     {
@@ -23,7 +22,6 @@ export default {
       exact: true,
     },
     {
-      name: 'dashboard.preferences.users.roles',
       path: '/roles',
       component: RolesList,
       exact: true,
diff --git a/client/src/store/currencies/currencies.reducer.js b/client/src/store/currencies/currencies.reducer.js
index ea5a3cb7a..99873e7b2 100644
--- a/client/src/store/currencies/currencies.reducer.js
+++ b/client/src/store/currencies/currencies.reducer.js
@@ -2,9 +2,7 @@ import { createReducer } from '@reduxjs/toolkit';
 import t from 'store/types';
 
 const initialState = {
-  preferences: {
-    currencies: [],
-  },
+  data: {},
 };
 
 export default createReducer(initialState, {
@@ -14,8 +12,8 @@ export default createReducer(initialState, {
     action.currencies.forEach((currency) => {
       _currencies[currency.currency_code] = currency;
     });
-    state.preferences.currencies = {
-      ...state.preferences.currencies,
+    state.data = {
+      ...state.data,
       ..._currencies,
     };
   },
diff --git a/client/src/store/currencies/currencies.selector.js b/client/src/store/currencies/currencies.selector.js
index cac3344c0..b5bfd40fe 100644
--- a/client/src/store/currencies/currencies.selector.js
+++ b/client/src/store/currencies/currencies.selector.js
@@ -1,3 +1,9 @@
-export const getCurrencyById = (items, id) => {
-  return items[id] || null;
+// @flow
+
+export const getCurrencyById = (currencies: Object, id: Integer) => {
+  return Object.values(currencies).find(c => c.id == id) || null;
 };
+
+export const getCurrencyByCode = (currencies: Object, currencyCode: String) => {
+  return currencies[currencyCode] || null;
+};
\ No newline at end of file