diff --git a/web/package.json b/web/package.json
index 8822500e..098031b1 100644
--- a/web/package.json
+++ b/web/package.json
@@ -3,32 +3,32 @@
   "version": "1.1.3",
   "private": true,
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "^1.2.28",
-    "@fortawesome/free-brands-svg-icons": "^5.13.0",
-    "@fortawesome/free-regular-svg-icons": "^5.13.0",
-    "@fortawesome/free-solid-svg-icons": "^5.13.0",
-    "@fortawesome/react-fontawesome": "^0.1.9",
-    "@loadable/component": "^5.12.0",
-    "attr-accept": "^2.1.0",
-    "bootstrap": "^4.5.0",
+    "@fortawesome/fontawesome-svg-core": "^1.2.30",
+    "@fortawesome/free-brands-svg-icons": "^5.14.0",
+    "@fortawesome/free-regular-svg-icons": "^5.14.0",
+    "@fortawesome/free-solid-svg-icons": "^5.14.0",
+    "@fortawesome/react-fontawesome": "^0.1.11",
+    "@loadable/component": "^5.13.2",
+    "attr-accept": "^2.2.2",
+    "bootstrap": "^4.5.2",
     "chart.js": "^2.9.3",
     "classnames": "^2.2.6",
-    "echarts": "^4.7.0",
-    "echarts-for-react": "^2.0.15-beta.1",
+    "echarts": "^4.9.0",
+    "echarts-for-react": "^2.0.16",
     "element-resize-event": "^3.0.3",
     "emoji-mart": "^3.0.0",
-    "google-maps-react": "^2.0.2",
+    "google-maps-react": "^2.0.6",
     "i18next": "^19.6.3",
     "is_js": "^0.9.0",
-    "leaflet": "^1.6.0",
+    "leaflet": "^1.7.1",
     "leaflet.markercluster": "^1.4.1",
     "leaflet.tilelayer.colorfilter": "^1.2.5",
-    "lodash": "^4.17.15",
-    "moment": "^2.24.0",
+    "lodash": "^4.17.20",
+    "moment": "^2.28.0",
     "node-sass": "^4.14.1",
-    "plyr": "^3.5.10",
+    "plyr": "^3.6.2",
     "prism-react-renderer": "^0.1.7",
-    "prism-themes": "^1.3.0",
+    "prism-themes": "^1.4.0",
     "prop-types": "^15.7.2",
     "rc-cascader": "^1.3.0",
     "react": "^16.13.1",
@@ -36,32 +36,32 @@
     "react-beautiful-dnd": "^13.0.0",
     "react-bootstrap-table-next": "^3.3.5",
     "react-bootstrap-table2-paginator": "^2.1.2",
-    "react-chartjs-2": "^2.9.0",
+    "react-chartjs-2": "^2.10.0",
     "react-countup": "^4.3.3",
     "react-datetime": "^2.16.3",
     "react-dom": "^16.13.1",
     "react-dropzone": "^10.2.2",
-    "react-es6-progressbar.js": "^1.0.20",
+    "react-es6-progressbar.js": "^1.1.0",
     "react-hook-form": "^4.10.2",
     "react-i18next": "^11.7.0",
     "react-image-lightbox": "^5.1.1",
     "react-image-video-lightbox": "^2.0.1",
-    "react-leaflet": "^2.6.3",
+    "react-leaflet": "^2.7.0",
     "react-live": "^2.2.2",
     "react-lottie": "^1.2.3",
     "react-quill": "^1.3.5",
     "react-rating": "^2.0.5",
     "react-router-bootstrap": "^0.25.0",
-    "react-router-dom": "^5.1.2",
-    "react-scripts": "^3.4.1",
-    "react-scroll": "^1.7.16",
-    "react-scrollbars-custom": "^4.0.21",
+    "react-router-dom": "^5.2.0",
+    "react-scripts": "^3.4.3",
+    "react-scroll": "^1.8.1",
+    "react-scrollbars-custom": "^4.0.25",
     "react-select": "^3.1.0",
     "react-simple-code-editor": "^0.9.15",
     "react-slick": "^0.25.2",
     "react-toastify": "^5.5.0",
     "react-typed": "^1.2.0",
-    "reactstrap": "^8.4.1",
+    "reactstrap": "^8.6.0",
     "slick-carousel": "^1.8.1",
     "uuid": "^3.4.0"
   },
@@ -76,17 +76,17 @@
     "extends": "react-app"
   },
   "devDependencies": {
-    "browser-sync": "^2.26.7",
+    "browser-sync": "^2.26.12",
     "eslint-config-prettier": "^4.2.0",
-    "eslint-plugin-prettier": "^3.1.2",
-    "eslint-plugin-react": "^7.19.0",
+    "eslint-plugin-prettier": "^3.1.4",
+    "eslint-plugin-react": "^7.20.6",
     "gulp": "^4.0.2",
     "gulp-autoprefixer": "^6.1.0",
     "gulp-clean-css": "^4.3.0",
     "gulp-plumber": "^1.2.1",
     "gulp-rename": "^1.4.0",
     "gulp-rtlcss": "^1.4.1",
-    "gulp-sass": "^4.0.2",
+    "gulp-sass": "^4.1.0",
     "gulp-sourcemaps": "^2.6.5",
     "prettier": "1.17.1"
   }
diff --git a/web/src/Main.js b/web/src/Main.js
index 97f5e74b..aef302ea 100644
--- a/web/src/Main.js
+++ b/web/src/Main.js
@@ -1,47 +1,57 @@
 import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import AppContext from './context/Context';
+import { settings } from './config';
 import toggleStylesheet from './helpers/toggleStylesheet';
 import { getItemFromStore, setItemToStore, themeColors } from './helpers/utils';
 import i18n from "i18next";
 
 const Main = props => {
-  const [isFluid, setIsFluid] = useState(getItemFromStore('isFluid', true));
-  const [isRTL, setIsRTL] = useState(getItemFromStore('isRTL', false));
-  const [isDark, setIsDark] = useState(getItemFromStore('isDark', true));
-  const [isTopNav, setIsTopNav] = useState(getItemFromStore('isTopNav', true));
+  const [isFluid, setIsFluid] = useState(getItemFromStore('isFluid', settings.isFluid));
+  const [isRTL, setIsRTL] = useState(getItemFromStore('isRTL', settings.isRTL));
+  const [isDark, setIsDark] = useState(getItemFromStore('isDark', settings.isDark));
+  const [isTopNav, setIsTopNav] = useState(getItemFromStore('isTopNav', settings.isTopNav));
+  const [isCombo, setIsCombo] = useState(getItemFromStore('isCombo', settings.isCombo));
+  const [isVertical, setIsVertical] = useState(getItemFromStore('isVertical', settings.isVertical));
   const [isNavbarVerticalCollapsed, setIsNavbarVerticalCollapsed] = useState(
-    getItemFromStore('isNavbarVerticalCollapsed', false)
+    getItemFromStore('isNavbarVerticalCollapsed', settings.isNavbarVerticalCollapsed)
   );
-  const [currency, setCurrency] = useState('$');
-  const [showBurgerMenu, setShowBurgerMenu] = useState(false);
+  const [currency, setCurrency] = useState(settings.currency);
+  const [showBurgerMenu, setShowBurgerMenu] = useState(settings.showBurgerMenu);
   const [isLoaded, setIsLoaded] = useState(false);
   const [isOpenSidePanel, setIsOpenSidePanel] = useState(false);
-  const [navbarStyle, setNavbarStyle] = useState(getItemFromStore('navbarStyle', 'vibrant'));
-  const [language, setLanguage] = useState(getItemFromStore('language', 'zh_cn'));
+  const [navbarCollapsed, setNavbarCollapsed] = useState(false);
+
+  const [navbarStyle, setNavbarStyle] = useState(getItemFromStore('navbarStyle', settings.navbarStyle));
+  const [language, setLanguage] = useState(getItemFromStore('language', settings.language));
 
   const toggleModal = () => setIsOpenSidePanel(prevIsOpenSidePanel => !prevIsOpenSidePanel);
-
   const value = {
     isRTL,
     isDark,
+    isCombo,
     isFluid,
     setIsRTL,
     isTopNav,
     currency,
     setIsDark,
+    setIsCombo,
     setIsFluid,
+    isVertical,
     toggleModal,
     setIsTopNav,
     navbarStyle,
     setCurrency,
+    setIsVertical,
     showBurgerMenu,
     setNavbarStyle,
     language,
     setLanguage,
     isOpenSidePanel,
+    navbarCollapsed,
     setShowBurgerMenu,
     setIsOpenSidePanel,
+    setNavbarCollapsed,
     isNavbarVerticalCollapsed,
     setIsNavbarVerticalCollapsed
   };
@@ -77,11 +87,20 @@ const Main = props => {
     // eslint-disable-next-line
   }, [isTopNav]);
 
+  useEffect(() => {
+    setItemToStore('isCombo', isCombo);
+    // eslint-disable-next-line
+  }, [isCombo]);
+  useEffect(() => {
+    setItemToStore('isVertical', isVertical);
+    // eslint-disable-next-line
+  }, [isVertical]);
+
   useEffect(() => {
     setItemToStore('navbarStyle', navbarStyle);
     // eslint-disable-next-line
   }, [navbarStyle]);
-
+  
   useEffect(() => {
     setItemToStore('language', language);
     i18n.changeLanguage(language)
diff --git a/web/src/components/bootstrap-components/Badges.js b/web/src/components/bootstrap-components/Badges.js
index 449075d9..2abe0017 100644
--- a/web/src/components/bootstrap-components/Badges.js
+++ b/web/src/components/bootstrap-components/Badges.js
@@ -6,7 +6,7 @@ import FalconCardHeader from '../common/FalconCardHeader';
 import FalconEditor from '../common/FalconEditor';
 
 const contextualCode = `['primary', 'secondary', 'success', 'danger', 'warning', 'info', 'light', 'dark'].map((color, index) => (
-  <Badge color={color} key={index} className="mr-2">
+  <Badge color={color} key={index} className="mr-2" >
     {color}
   </Badge>
 ))`;
@@ -18,7 +18,7 @@ const softBadgesCode = `['primary', 'secondary', 'success', 'danger', 'warning',
 ))`;
 
 const softBadgesPillCode = `['primary', 'secondary', 'success', 'danger', 'warning', 'info', 'light', 'dark'].map((color, index) => (
-  <Badge color={'badge-pill badge-soft-'+color} key={index} className="mr-2">
+  <Badge color={'soft-'+color} key={index} className="mr-2" pill>
     {color}
   </Badge>
 ))`;
diff --git a/web/src/components/bootstrap-components/Cards.js b/web/src/components/bootstrap-components/Cards.js
index b84489d1..edfdb868 100644
--- a/web/src/components/bootstrap-components/Cards.js
+++ b/web/src/components/bootstrap-components/Cards.js
@@ -34,7 +34,7 @@ const cardStyleCode = `<CardColumns>
 const basicExampleCode = `<Card style={{width: '20rem'}}>
   <CardImg src={generic1} top />
   <CardBody>
-    <CardTitle tag="h5" tag="h5">
+    <CardTitle tag="h5">
       Card title
     </CardTitle>
     <CardText tag="p">
diff --git a/web/src/components/bootstrap-components/Combo.js b/web/src/components/bootstrap-components/Combo.js
new file mode 100644
index 00000000..1a73efd5
--- /dev/null
+++ b/web/src/components/bootstrap-components/Combo.js
@@ -0,0 +1,63 @@
+import React, { Fragment, useContext } from 'react';
+import { Button, Card, CardBody } from 'reactstrap';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import PageHeader from '../common/PageHeader';
+import FalconCardHeader from '../common/FalconCardHeader';
+import AppContext from '../../context/Context';
+
+const Combo = () => {
+  const { setIsOpenSidePanel } = useContext(AppContext);
+
+  return (
+    <Fragment>
+      <PageHeader
+        title="Combo Nav"
+        description="Combo Nav is an additional layout system of Falcon where you can place both Navbar Top and Navbar Vertical in a same page."
+        className="mb-3"
+      >
+        <Button
+          onClick={() => {
+            setIsOpenSidePanel(pre => !pre);
+          }}
+          color="link"
+          size="sm"
+          className="pl-0"
+        >
+          Toggle Combo Nav on Side panel
+          <FontAwesomeIcon icon="chevron-right" className="ml-1 fs--2" />
+        </Button>
+      </PageHeader>
+      <Card className="mb-3">
+        <FalconCardHeader title="Supported Content" light={false} />
+        <CardBody className="bg-light">
+          <p>
+            Combo layout uses Falcon's{' '}
+            <a href="/components/navbar-vertical" target="_blank">
+              Navbar vertical{' '}
+            </a>
+            and{' '}
+            <a href="/components/navbar-top" target="_blank">
+              Navbar top
+            </a>
+            .
+          </p>
+          <p className="mb-0">
+            To enable Combo layout set <code>isCombo</code> to true in <code>src/config.js</code> file.
+          </p>
+        </CardBody>
+      </Card>
+      <Card className="mb-3">
+        <FalconCardHeader title="Behaviors" light={false} />
+        <CardBody className="bg-light">
+          {' '}
+          <p className="mb-0">
+            For responsive collapsing pass <code>{`expand = {'sm | md | lg | xl'}`}</code> prop to reactstrap{' '}
+            <code>Navbar</code> component.
+          </p>
+        </CardBody>
+      </Card>
+    </Fragment>
+  );
+};
+
+export default Combo;
diff --git a/web/src/components/bootstrap-components/ProgressBar.js b/web/src/components/bootstrap-components/ProgressBar.js
index c0bed922..60e0025a 100644
--- a/web/src/components/bootstrap-components/ProgressBar.js
+++ b/web/src/components/bootstrap-components/ProgressBar.js
@@ -124,12 +124,6 @@ const ProgressBar = () => {
           <FalconEditor code={stripedExampleCode} />
         </CardBody>
       </Card>
-      <Card className="mb-3">
-        <FalconCardHeader title="Animated" light={false} />
-        <CardBody className="bg-light">
-          <FalconEditor code={animatedExampleCode} language="jsx" />
-        </CardBody>
-      </Card>
     </Fragment>
   );
 };
diff --git a/web/src/components/changelog/changeLogs.js b/web/src/components/changelog/changeLogs.js
index 80dfb7ac..78de0fa5 100644
--- a/web/src/components/changelog/changeLogs.js
+++ b/web/src/components/changelog/changeLogs.js
@@ -1,8 +1,359 @@
 export default [
-  
+  {
+    title: `2.8.0 - Dickinson's kestrel`,
+    publish: '29 September, 2020',
+    logs: {
+      New: ['Navbar combo layout', '<strong>DOC</strong> : Navbar combo Doc'],
+      Update: ['<strong>DOC</strong>: Documentation'],
+      Migration: {
+        Add: ['<code>src/components/bootstrap-components/Combo.js</code>'],
+        Update: [
+          '<code>src/Main.js</code>',
+          '<code>src/context/Context.js</code>',
+          '<code>src/layouts/DashboardLayout.js</code>',
+          '<code>src/components/navbar/NavbarVertical.js</code>',
+          '<code>src/components/navbar/TopNavRightSideNavItem.js</code>',
+          '<code>src/components/side-panel/SidePanelModal.js</code>',
+          '<code>src/components/navbar/NavbarTopDropDownMenus.js</code>',
+          '<code>src/components/changelog/changeLogs.js</code>'
+        ]
+      }
+    }
+  },
+  {
+    title: '2.7.1 - Fox Kestrel',
+    publish: '21 September, 2020',
+    logs: {
+      New: ['<strong>DOC</strong> : Fontawesome Doc'],
+      Fix: [
+        'Message page textarea hight issue',
+        'Product details page review input field submit issue',
+        'Customer page nameFormatter function argument destructing issue',
+        'Fixes <code>Badge</code> component class name and <code>Card</code> component tag name'
+      ],
+      Migration: {
+        Add: ['<code>src/components/bootstrap-component/Fontawesome.js</code>'],
+        Update: [
+          '<code>src/components/chat/content/MessageTextArea.js</code>',
+          '<code>src/components/e-commerce/product-details/ProductDetailsFooter.js</code>',
+          '<code>src/components/e-commerce/Customers.js</code>'
+        ]
+      }
+    }
+  },
+  {
+    title: '2.7.0 - Spotted Kestrels',
+    publish: '2 July, 2020',
+    logs: {
+      New: [
+        'Navbar Inverted in Navbar Vertical',
+        'Navbar Vibrant in Navbar Vertical',
+        'Navbar Card in Navbar Vertical',
+        '<strong>DOC</strong> : Vertical Navbar'
+      ],
+      Migration: {
+        Add: ['<code>src/components/bootstrap-component/VerticalNavbar.js</code>'],
+        Update: [
+          '<code>src/component/main.js</code>',
+          '<code>src/component/navbar/NavbarVertical.js</code>',
+          '<code>src/component/side-panel/SidePanelModal.js</code>',
+          '<code>src/assets/scss/theme/_buttons.scss</code>',
+          '<code>src/assets/scss/dark/_variables.scss</code>',
+          '<code>src/assets/scss/theme/_variables.scss</code>',
+          '<code>src/assets/scss/theme/_Navbar-vertical.scss</code>'
+        ]
+      }
+    }
+  },
+  {
+    title: '2.6.0 - Laughing',
+    publish: '27 june, 2020',
+    logs: {
+      New: [
+        '<strong>Page</strong>: Kanban',
+        '<strong>Plugin</strong>: <code>React Beautiful DnD</code>',
+        '<strong>Component</strong>: Cookie Notice Alert',
+        '<strong>Doc</strong>: React Beautiful DnD',
+        '<strong>Doc</strong>: Cookie Notice Alert',
+        '<strong>Doc</strong>: React Bootstrap Table next'
+      ],
+
+      Fix: ['Sidebar sticky-top on profile page.'],
+
+      Migration: {
+        Add: [
+          '<code>src/components/kanban/**/*.*</code>',
+          '<code>src/components/bootstrap-component/cookieNotice.js</code>',
+          '<code>src/components/plugins/ReactBeautifulDnD.js</code>',
+          '<code>src/components/plugins/ReactBootstrapTable2.js</code>',
+          '<code>src/assets/scss/_kanban.scss</code>',
+          '<code>src/assets/scss/_notice.scss</code>'
+        ],
+        Update: [
+          '<code>src/routs.js</code>',
+          '<code>src/helpers/utils.js</code>',
+          '<code>src/layout/DashboardRoutes.js</code>',
+          '<code>src/layout/DashboardLayout.js</code>',
+          '<code>src/component/side-panel/SidePanelModal.js</code>',
+          '<code>src/component/navbar/navbarTop.js</code> (removed <code>sticky-top</code> class from Navbar)',
+          '<code>src/assets/scss/theme/_theme.scss</code>',
+          '<code>src/assets/scss/theme/_mixed.scss</code>',
+          '<code>src/assets/scss/theme/_modal.scss</code>',
+          '<code>src/assets/scss/dark/_override.scss</code>',
+          '<code>src/assets/scss/theme/_border.scss</code>',
+          '<code>src/assets/scss/theme/_dropdown.scss</code>',
+          '<code>src/assets/scss/theme/_scrollbar.scss</code>',
+          '<code>src/assets/scss/theme/utilities/_hover.scss</code>',
+          '<code>src/assets/scss/theme/utilities/_line-height.scss</code>'
+        ]
+      }
+    }
+  },
+  {
+    title: '2.5.0 - Chipping',
+    publish: '29 April, 2020',
+    logs: {
+      New: [
+        '<strong>Page</strong>: <code>Widgets</code>',
+        '<strong>Component Page</strong>: <code>Carousel</code>',
+        '<strong>Component Page</strong>: <code>Spinner</code>',
+        '<strong>Component</strong>: <code>Navber Top</code>',
+        '<strong>Component</strong>: <code>Sidepanel Modal</code>',
+        '<strong>Dropdown On Hover</strong>',
+        '<strong>Component Doc</strong>: <code>Navbar Top</code> ',
+        '<strong>Component Doc</strong>: <code>Sidepanel</code>'
+      ],
+
+      Fix: ['Gap between Photos card and Experience card in smaller device'],
+
+      Migration: {
+        Add: [
+          '<code>src/assets/scss/theme/_modal.scss</code>',
+          '<code>src/components/widgets/**/*.*</code>',
+          '<code>src/components/side-panel/**/*.*</code>',
+          '<code>src/components/email/EmailDetailHeader.js</code>',
+          '<code>src/components/navbar/SettingsAnimatedIcon.js</code>',
+          '<code>src/components/navbar/TopNavRightSideNavItem.js</code>',
+          '<code>src/components/e-commerce/OrderDetailsHeader.js</code>',
+          '<code>src/components/bootstrap-components/NavBarTop.js</code>',
+          '<code>src/components/navbar/LandingRightSideNavItem.js</code>',
+          '<code>src/components/bootstrap-components/Sidepanel.js</code>',
+          '<code>src/components/bootstrap-components/Carousel.js</code>',
+          '<code>src/components/bootstrap-components/Spinners.js</code>',
+          '<code>src/components/navbar/NavbarDropdownComponents.js</code>',
+          '<code>src/components/dashboard/DashboardDepositStatus.js</code>'
+        ],
+        Update: [
+          '<code>src/assets/scss/theme/_theme.scss</code>',
+          '<code>src/assets/scss/theme/_forms.scss</code>',
+          '<code>src/assets/scss/theme/_scrollbar.scss</code>',
+          '<code>src/assets/scss/theme/_navbar.scss</code>',
+          '<code>src/assets/scss/theme/_navbar-top.scss</code>',
+          '<code>src/assets/scss/theme/_navbar-vertical.scss</code>',
+          '<code>src/assets/scss/theme/_button.scss</code>',
+          '<code>src/assets/scss/theme/utilities/_background.scss</code> in this file updated <code>.bg-gradient</code> class',
+          '<code>src/assets/scss/theme/_variables.scss</code> updated tooltip variable',
+          '<code>src/assets/scss/theme/_documentation.scss</code>',
+
+          '<code>src/Main.js</code>',
+          '<code>src/routes.js</code>',
+          '<code>src/config.js</code>',
+          '<code>src/helpers/utils.js</code>',
+          '<code>src/components/page/People.js</code>',
+          '<code>src/layouts/DashboardLayout.js</code>',
+          '<code>src/components/email/Compose.js</code>',
+          '<code>src/components/feed/FeedCard.js</code>',
+          '<code>src/components/feed/AddToFeed.js</code>',
+          '<code>src/components/navbar/NavbarTop.js</code>',
+          '<code>src/components/email/EmailDetail.js</code>',
+          '<code>src/components/feed/FeedInterest.js</code>',
+          '<code>src/components/page/InvitePeople.js</code>',
+          '<code>src/components/page/Notifications.js</code>',
+          '<code>src/components/feed/BirthdayNotice.js</code>',
+          '<code>src/components/navbar/NavbarStandard.js</code>',
+          '<code>src/components/experience/Experience.js</code>',
+          '<code>src/components/profile/ProfileFooter.js</code>',
+          '<code>src/components/dashboard-alt/Weather.js</code>',
+          '<code>src/components/navbar/NavbarDropdown.js</code>',
+          '<code>src/components/navbar/ProfileDropdown.js</code>',
+          '<code>src/components/dashboard-alt/TopProducts.js</code>',
+          '<code>src/components/dashboard-alt/DashboardAlt.js</code>',
+          '<code>src/components/dashboard-alt/SpaceWarning.js</code>',
+          '<code>src/components/navbar/NotificationDropdown.js</code>',
+          '<code>src/components/profile/ProfileContent.js</code> from this file, <code>ActivityLog</code> Component has been updated'
+        ]
+      }
+    }
+  },
+  {
+    title: '2.4.0 - Nankeen Kestrel',
+    publish: '2 April, 2020',
+    logs: {
+      New: [
+        '<strong>Page</strong>: Chat',
+        '<strong>Plugin</strong>: <code>Emoji Mart</code>',
+        '<strong>Doc</strong>: Emoji Mart'
+      ],
+      Fix: ['Dashboard recent purchases Table caret icon sorting direction issue.'],
+
+      Migration: {
+        Add: [
+          '<code>src/components/chat/**/*.*</code>',
+          '<code>src/assets/scss/theme/_chat.scss</code>',
+          '<code>src/assets/scss/theme/plugins/_emoji.scss</code>'
+        ],
+        Update: [
+          '<code>src/assets/scss/theme/_theme.scss</code>',
+          '<code>src/assets/scss/theme/_plugins.scss</code>',
+          '<code>src/assets/scss/theme/plugins/_react-bootstrap-table2-sort.scss</code>'
+        ]
+      }
+    }
+  },
+  {
+    title: '2.3.1 - Common Kestrel',
+    publish: '10 March, 2020',
+    logs: {
+      Fix: ['Main Navigation collapse issue when navigating between pages from mobile devices'],
+      Migration: {
+        Replace: [
+          '<code>src/components/navbar/NavbarVerticalMenu.js</code>',
+          '<code>src/components/common/CodeHighlight.js</code>',
+          '<code>src/components/changelog/**/*.*</code>'
+        ]
+      }
+    }
+  },
+  {
+    title: '2.3.0 - Lesser Kestrel',
+    publish: '27 February, 2020',
+    logs: {
+      New: ['<strong>Feature</strong>: Navbar vertical collapsed'],
+      Update: ['<strong>Doc</strong>: Lottie', '<strong>Doc</strong>: Dropzone'],
+      Migration: {
+        Replace: [
+          '<code>package.json</code>',
+          '<code>public/index.html</code>',
+          '<code>public/css/**/*.*</code>',
+          '<code>src/assets/scss/**/*.*</code>',
+          '<code>src/Main.js</code>',
+          '<code>src/helpers/toggleStylesheet.js</code>',
+          '<code>src/components/dashboard/LeafletMap.js</code>',
+          '<code>src/components/navbar/NavbarTop.js</code>',
+          '<code>src/components/navbar/NavbarVertical.js</code>',
+          '<code>src/components/navbar/NavbarVerticalMenu.js</code>',
+          '<code>src/components/navbar/NavbarVerticalMenuItem.js</code>',
+          '<code>src/components/changelog/**/*.*</code>'
+        ],
+        Add: [
+          '<code>src/components/navbar/ToggleButton.js</code>',
+          '<code>src/components/common/CodeHighlight.js</code>'
+        ]
+      }
+    }
+  },
+  {
+    title: '2.2.0 - Laggar',
+    publish: '10 February, 2020',
+    logs: {
+      New: [
+        '<strong>Plugin</strong>: <code>React leaflet map</code>',
+        '<strong>Plugin</strong>: <code>leaflet-markercluster</code>',
+        '<strong>Plugin</strong>: <code>leaflet.tilelayer.colorfilter</code>',
+        '<strong>Plugin</strong>: <code>react-scrollbars-custom</code>',
+        '<strong>Component</strong>: Custom Scrollbar',
+        '<strong>Doc</strong>: React Hook Form',
+        '<strong>Doc</strong>: Custom Scroll Bar',
+        '<strong>Doc</strong>: Leaflet Map',
+        '<strong>Doc</strong>: Echart Map'
+      ],
+      Update: [
+        '<strong>Component</strong>: Disable Button',
+        '<strong>Component</strong>: Purchases Table',
+        '<strong>Component</strong>: Leaflet Map (Dashboard alt)',
+        '<strong>Page</strong>: products List',
+        '<strong>Doc</strong>: Echart'
+      ]
+    }
+  },
+  {
+    title: '2.1.0 - Saker',
+    publish: '20 January, 2020',
+    logs: {
+      New: [
+        '<strong>Page</strong>: Authentication step wizard',
+        '<strong>Plugin</strong>: <code>react-hook-form</code>'
+      ]
+    }
+  },
+  {
+    title: '2.0.0 - Lanner',
+    publish: '01 January, 2020',
+    logs: {
+      New: [
+        '<strong>Component</strong>: Running Projects (Dashboard alt)',
+        '<strong>Component</strong>: Total Sales (Dashboard alt)',
+        '<strong>Mode</strong>: Dark',
+        '<strong>Doc</strong>: Plyr',
+        '<strong>Doc</strong>: Slick Carousel'
+      ],
+      Update: ['<strong>Doc</strong>: Echart']
+    }
+  },
+  {
+    title: '1.3.0 - Aplomado',
+    publish: '18 December, 2019',
+    logs: {
+      New: ['<strong>Page</strong>: Feed', '<strong>Plugin</strong>: Plyr']
+    }
+  },
+  {
+    title: '1.2.0 - Kestrels',
+    publish: '11 December, 2019',
+    logs: {
+      New: [
+        '<strong>Page</strong>: Product List',
+        '<strong>Page</strong>: Product Grid',
+        '<strong>Page</strong>: Product Details',
+        '<strong>Page</strong>: Orders',
+        '<strong>Page</strong>: Order Details',
+        '<strong>Page</strong>: Customers',
+        '<strong>Page</strong>: Shopping Cart',
+        '<strong>Page</strong>: Checkout',
+        '<strong>Page</strong>: Favorite Items',
+        'Counter on cart icon'
+      ],
+      Update: [
+        '<strong>CSS</strong>: Bootstrap to <code>v4.4.1</code>',
+        '<strong>Js</strong>: <code>utils.js</code>',
+        'Top nav badge icons'
+      ]
+    }
+  },
+  {
+    title: '1.1.0 - Gyrfalcon',
+    publish: '04 November, 2019',
+    logs: {
+      New: [
+        '<strong>Page</strong>: Dashboard Alt',
+        '<strong>Page</strong>: Inbox',
+        '<strong>Page</strong>: Email detail',
+        '<strong>Page</strong>: Compose',
+        '<strong>Plugin</strong>: Bulk select',
+        '<strong>Plugin</strong>: WYSIWYG Editor',
+        '<strong>Plugin</strong>: Progressbar'
+      ],
+      Fix: ['Redirect to 404'],
+      Update: [
+        'Add autoprefixer configuration in <code>package.json</code>',
+        'Update autoprefixer configuration in <code>gulpfile.js</code>',
+        '<strong>Js</strong>: <code>utils.js</code>'
+      ]
+    }
+  },
   {
     title: '1.0.0 - initial release',
-    publish: '10 July, 2020',
+    publish: '30 September, 2019',
     children: 'Nothing to see here.'
   }
 ];
diff --git a/web/src/components/chat/Chat.js b/web/src/components/chat/Chat.js
index 0aec8dd8..e9b13fde 100644
--- a/web/src/components/chat/Chat.js
+++ b/web/src/components/chat/Chat.js
@@ -5,15 +5,17 @@ import ChatSidebar from './sidebar/ChatSidebar';
 import ChatContent from './content/ChatContent';
 import Flex from '../common/Flex';
 
-const Chat = () => (
-  <ChatProvider>
-    <Card className="card-chat">
-      <CardBody tag={Flex} className="p-0 h-100">
-        <ChatSidebar />
-        <ChatContent />
-      </CardBody>
-    </Card>
-  </ChatProvider>
-);
+const Chat = () => {
+  return (
+    <ChatProvider>
+      <Card className="card-chat">
+        <CardBody tag={Flex} className="p-0 h-100">
+          <ChatSidebar />
+          <ChatContent />
+        </CardBody>
+      </Card>
+    </ChatProvider>
+  );
+};
 
 export default Chat;
diff --git a/web/src/components/chat/content/MessageTextArea.js b/web/src/components/chat/content/MessageTextArea.js
index f48a7b49..bb0018c2 100644
--- a/web/src/components/chat/content/MessageTextArea.js
+++ b/web/src/components/chat/content/MessageTextArea.js
@@ -1,189 +1,196 @@
-import React, { useState, useContext, useEffect } from 'react';
-import PropTypes from 'prop-types';
-import { Input, Label, Form, Button } from 'reactstrap';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import 'emoji-mart/css/emoji-mart.css';
-import { Picker } from 'emoji-mart';
-import AppContext, { ChatContext } from '../../../context/Context';
-import classNames from 'classnames';
-import { getGrays } from '../../../helpers/utils';
-
-const formatDate = date => {
-  const options = {
-    weekday: 'short',
-    day: 'numeric',
-    month: 'long',
-    year: 'numeric',
-    hour: 'numeric',
-    minute: 'numeric'
-  };
-
-  const now = date
-    .toLocaleString('en-US', options)
-    .split(',')
-    .map(item => item.trim());
-
-  return {
-    day: now[0],
-    hour: now[3],
-    date: now[1] + ', ' + now[2]
-  };
-};
-
-const MessageTextArea = ({ thread }) => {
-  const { isDark, isRTL } = useContext(AppContext);
-  const { messages, messagesDispatch, threadsDispatch, textAreaInitialHeight, setTextAreaInitialHeight } = useContext(
-    ChatContext
-  );
-  const [previewEmoji, setPreviewEmoji] = useState(false);
-  const [message, setMessage] = useState('');
-
-  //Emoji box hiding Controller
-  useEffect(() => {
-    const handleClickOutsideEmojiBox = e => {
-      if (e.target.closest('.emoji-mart') || e.target.closest('.textarea')) return;
-      setPreviewEmoji(false);
-    };
-
-    if (previewEmoji) {
-      document.addEventListener('click', handleClickOutsideEmojiBox, false);
-    } else {
-      document.removeEventListener('click', handleClickOutsideEmojiBox, false);
-    }
-
-    return () => document.removeEventListener('click', handleClickOutsideEmojiBox, false);
-  }, [previewEmoji]);
-
-  useEffect(() => {
-    //TextBox and message body height controlling
-    let textAreaPreviousHeight = textAreaInitialHeight;
-    const autoExpand = function(field) {
-      // Reset field height
-      field.style.height = '2rem';
-
-      // Calculate the height
-      const textAreaCurrentHeight = field.scrollHeight;
-
-      if (textAreaCurrentHeight <= 160) {
-        if (textAreaPreviousHeight !== textAreaCurrentHeight) {
-          document.getElementsByClassName('card-chat-pane')[0].style.height = `calc(100% - ${textAreaCurrentHeight}px)`;
-
-          setTextAreaInitialHeight((textAreaPreviousHeight = textAreaCurrentHeight));
-        }
-      }
-
-      field.style.height = textAreaCurrentHeight + 'px';
-    };
-    document.addEventListener(
-      'input',
-      function(event) {
-        if (event.target.className === 'textarea');
-        autoExpand(event.target);
-      },
-      false
-    );
-  }, [textAreaInitialHeight, setTextAreaInitialHeight]);
-
-  const addEmoji = e => {
-    let emoji = e.native;
-    setMessage(message + emoji);
-  };
-
-  const handleSubmit = e => {
-    e.preventDefault();
-    const date = new Date();
-
-    let newMessage = {
-      senderUserId: 3,
-      message: `${message.replace(/(?:\r\n|\r|\n)/g, '<br>')}`,
-      status: 'delivered',
-      time: formatDate(date)
-    };
-
-    const { content } = messages.find(({ id }) => id === thread.messagesId);
-    if (message) {
-      messagesDispatch({
-        type: 'EDIT',
-        payload: { id: thread.messagesId, content: [...content, newMessage] },
-        id: thread.messagesId
-      });
-
-      threadsDispatch({
-        type: 'EDIT',
-        payload: thread,
-        id: thread.id,
-        isUpdatedStart: true
-      });
-    }
-
-    setMessage('');
-
-    document.getElementsByClassName('textarea')[0].style.height = '2rem';
-    document.getElementsByClassName('card-chat-pane')[0].style.height = `calc(100% - 2rem)`;
-  };
-
-  return (
-    <Form className="chat-editor-area bg-white" onSubmit={handleSubmit}>
-      <Input className="d-none" type="file" id="chat-file-upload" />
-      <Label for="chat-file-upload" className="mb-0 p-1 chat-file-upload cursor-pointer">
-        <FontAwesomeIcon icon="paperclip" />
-      </Label>
-
-      <Input
-        className="border-0 outline-none shadow-none resize-none textarea bg-white"
-        type="textarea"
-        placeholder="Type your message"
-        bsSize="sm"
-        value={message}
-        onChange={({ target }) => setMessage(target.value)}
-        style={{
-          height: '2rem',
-          maxHeight: '10rem',
-          paddingRight: isRTL ? '0.75rem' : '7rem',
-          paddingLeft: isRTL ? '7rem' : '0.75rem'
-        }}
-      />
-      <FontAwesomeIcon
-        icon={['far', 'laugh-beam']}
-        transform="grow-5"
-        className="emoji-icon"
-        onClick={() => setPreviewEmoji(!previewEmoji)}
-      />
-      {previewEmoji && (
-        <Picker
-          set="google"
-          onSelect={addEmoji}
-          sheetSize={20}
-          style={{
-            position: 'absolute',
-            bottom: '100%',
-            left: isRTL ? '2%' : 'auto',
-            right: isRTL ? 'auto' : '2%',
-            padding: 0,
-            zIndex: 1,
-            backgroundColor: getGrays(isDark)[100]
-          }}
-          theme={isDark ? 'dark' : 'light'}
-          showPreview={false}
-          showSkinTones={false}
-        />
-      )}
-      <Button
-        color="transparent"
-        size="sm"
-        className={classNames(`btn-send outline-none ml-1`, {
-          'text-primary': message.length > 0
-        })}
-        type="submit"
-      >
-        Send
-      </Button>
-    </Form>
-  );
-};
-
-MessageTextArea.propTypes = {
-  thread: PropTypes.object.isRequired
-};
-
-export default MessageTextArea;
+import React, { useState, useContext, useEffect, useRef } from 'react';
+import PropTypes from 'prop-types';
+import { Input, Label, Form, Button } from 'reactstrap';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import 'emoji-mart/css/emoji-mart.css';
+import { Picker } from 'emoji-mart';
+import AppContext, { ChatContext } from '../../../context/Context';
+import classNames from 'classnames';
+import { getGrays } from '../../../helpers/utils';
+
+const formatDate = date => {
+  const options = {
+    weekday: 'short',
+    day: 'numeric',
+    month: 'long',
+    year: 'numeric',
+    hour: 'numeric',
+    minute: 'numeric'
+  };
+
+  const now = date
+    .toLocaleString('en-US', options)
+    .split(',')
+    .map(item => item.trim());
+
+  return {
+    day: now[0],
+    hour: now[3],
+    date: now[1] + ', ' + now[2]
+  };
+};
+
+const MessageTextArea = ({ thread }) => {
+  const { isDark, isRTL } = useContext(AppContext);
+  const { messages, messagesDispatch, threadsDispatch, textAreaInitialHeight, setTextAreaInitialHeight } = useContext(
+    ChatContext
+  );
+  const [previewEmoji, setPreviewEmoji] = useState(false);
+  const [message, setMessage] = useState('');
+
+  const isMountedRef = useRef(null);
+
+  //Emoji box hiding Controller
+  useEffect(() => {
+    const handleClickOutsideEmojiBox = e => {
+      if (e.target.closest('.emoji-mart') || e.target.closest('.textarea')) return;
+      setPreviewEmoji(false);
+    };
+
+    if (previewEmoji) {
+      document.addEventListener('click', handleClickOutsideEmojiBox, false);
+    } else {
+      document.removeEventListener('click', handleClickOutsideEmojiBox, false);
+    }
+
+    return () => document.removeEventListener('click', handleClickOutsideEmojiBox, false);
+  }, [previewEmoji]);
+
+  useEffect(() => {
+    //TextBox and message body height controlling
+    isMountedRef.current = true;
+    let textAreaPreviousHeight = textAreaInitialHeight;
+    const autoExpand = function(field) {
+      // Reset field height
+      field.style.height = '2rem';
+
+      // Calculate the height
+      const textAreaCurrentHeight = field.scrollHeight;
+
+      if (textAreaCurrentHeight <= 160 && document.querySelector('.card-chat-pane')) {
+        if (textAreaPreviousHeight !== textAreaCurrentHeight && isMountedRef.current) {
+          document.querySelector('.card-chat-pane').style.height = `calc(100% - ${textAreaCurrentHeight}px)`;
+          setTextAreaInitialHeight((textAreaPreviousHeight = textAreaCurrentHeight));
+        }
+      }
+
+      field.style.height = textAreaCurrentHeight + 'px';
+    };
+    if (document.querySelector('.textarea')) {
+      document.addEventListener(
+        'input',
+        function(event) {
+          if (event.target.className === 'textarea');
+          autoExpand(event.target);
+        },
+        false
+      );
+    }
+    return () => {
+      isMountedRef.current = false;
+    };
+  }, [textAreaInitialHeight, setTextAreaInitialHeight]);
+
+  const addEmoji = e => {
+    let emoji = e.native;
+    setMessage(message + emoji);
+  };
+
+  const handleSubmit = e => {
+    e.preventDefault();
+    const date = new Date();
+
+    let newMessage = {
+      senderUserId: 3,
+      message: `${message.replace(/(?:\r\n|\r|\n)/g, '<br>')}`,
+      status: 'delivered',
+      time: formatDate(date)
+    };
+
+    const { content } = messages.find(({ id }) => id === thread.messagesId);
+    if (message) {
+      messagesDispatch({
+        type: 'EDIT',
+        payload: { id: thread.messagesId, content: [...content, newMessage] },
+        id: thread.messagesId
+      });
+
+      threadsDispatch({
+        type: 'EDIT',
+        payload: thread,
+        id: thread.id,
+        isUpdatedStart: true
+      });
+    }
+
+    setMessage('');
+
+    document.querySelector('.textarea').style.height = '2rem';
+    document.querySelector('.card-chat-pane').style.height = `calc(100% - 2rem)`;
+  };
+
+  return (
+    <Form className="chat-editor-area bg-white" onSubmit={handleSubmit}>
+      <Input className="d-none" type="file" id="chat-file-upload" />
+      <Label for="chat-file-upload" className="mb-0 p-1 chat-file-upload cursor-pointer">
+        <FontAwesomeIcon icon="paperclip" />
+      </Label>
+
+      <Input
+        className="border-0 outline-none shadow-none resize-none textarea bg-white"
+        type="textarea"
+        placeholder="Type your message"
+        bsSize="sm"
+        value={message}
+        onChange={({ target }) => setMessage(target.value)}
+        style={{
+          height: '2rem',
+          maxHeight: '10rem',
+          paddingRight: isRTL ? '0.75rem' : '7rem',
+          paddingLeft: isRTL ? '7rem' : '0.75rem'
+        }}
+      />
+      <FontAwesomeIcon
+        icon={['far', 'laugh-beam']}
+        transform="grow-5"
+        className="emoji-icon"
+        onClick={() => setPreviewEmoji(!previewEmoji)}
+      />
+      {previewEmoji && (
+        <Picker
+          set="google"
+          onSelect={addEmoji}
+          sheetSize={20}
+          style={{
+            position: 'absolute',
+            bottom: '100%',
+            left: isRTL ? '2%' : 'auto',
+            right: isRTL ? 'auto' : '2%',
+            padding: 0,
+            zIndex: 1,
+            backgroundColor: getGrays(isDark)[100]
+          }}
+          theme={isDark ? 'dark' : 'light'}
+          showPreview={false}
+          showSkinTones={false}
+        />
+      )}
+      <Button
+        color="transparent"
+        size="sm"
+        className={classNames(`btn-send outline-none ml-1`, {
+          'text-primary': message.length > 0
+        })}
+        type="submit"
+      >
+        Send
+      </Button>
+    </Form>
+  );
+};
+
+MessageTextArea.propTypes = {
+  thread: PropTypes.object.isRequired
+};
+
+export default MessageTextArea;
diff --git a/web/src/components/common/FalconProgress.js b/web/src/components/common/FalconProgress.js
new file mode 100644
index 00000000..ef378897
--- /dev/null
+++ b/web/src/components/common/FalconProgress.js
@@ -0,0 +1,37 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import FalconProgressBar from './FalconProgressBar';
+
+const FalconProgress = ({ value, className, style, color, barStyle, barClassName, multi, children, bar }) => {
+  return (
+    <>
+      {bar === true ? (
+        <FalconProgressBar />
+      ) : (
+        <div className={`progress ${className ?? ''} bg-${color}`} style={style}>
+          {multi ? (
+            children
+          ) : (
+            <FalconProgressBar value={value} className={barClassName} color={color} style={barStyle} />
+          )}
+        </div>
+      )}
+    </>
+  );
+};
+
+FalconProgress.propTypes = {
+  value: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).isRequired,
+  color: PropTypes.string,
+  barStyle: PropTypes.object,
+  className: PropTypes.string,
+  barClassName: PropTypes.string,
+  style: PropTypes.object,
+  multi: PropTypes.bool
+};
+
+FalconProgress.defaultProps = {
+  value: 0
+};
+
+export default FalconProgress;
diff --git a/web/src/components/common/FalconProgressBar.js b/web/src/components/common/FalconProgressBar.js
new file mode 100644
index 00000000..80085d7d
--- /dev/null
+++ b/web/src/components/common/FalconProgressBar.js
@@ -0,0 +1,14 @@
+import React from 'react';
+
+const FalconProgressBar = ({ className, barStyle, value, color }) => (
+  <div
+    className={`progress-bar ${className ?? ''} bg-${color}`}
+    style={{ ...barStyle, width: `${value}%` }}
+    role="progressbar"
+    aria-valuenow={value}
+    aria-valuemin="0"
+    aria-valuemax="100"
+  />
+);
+
+export default FalconProgressBar;
diff --git a/web/src/components/dashboard-alt/BestSellingProduct.js b/web/src/components/dashboard-alt/BestSellingProduct.js
index 7a2bd30f..1cafc6ef 100644
--- a/web/src/components/dashboard-alt/BestSellingProduct.js
+++ b/web/src/components/dashboard-alt/BestSellingProduct.js
@@ -1,10 +1,11 @@
 import React, { useContext } from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import { Media, Progress } from 'reactstrap';
+import { Media } from 'reactstrap';
 import Flex from '../common/Flex';
 import AppContext from '../../context/Context';
 import { Link } from 'react-router-dom';
+import FalconProgress from '../common/FalconProgress';
 
 const getProductItemCalculatedData = (unit, price, totalPrice) => {
   const productTotalPrice = unit * price;
@@ -37,14 +38,15 @@ const BestSellingProduct = ({ product, totalPrice, isLast }) => {
         {productTotalPrice}
       </td>
       <td className="align-middle pr-card">
-        <Flex align="center">
-          <Progress
+        <Flex align="center" justify="between">
+          <FalconProgress
             value={percentage}
             color="primary"
-            className="w-100 mr-2 rounded-soft bg-200"
+            className="w-100 rounded-soft bg-200"
             barClassName="rounded-capsule"
-            style={{ height: '5px' }}
+            style={{ height: 5, maxWidth: 54 }}
           />
+
           <div className="font-weight-semi-bold ml-2">{percentage}%</div>
         </Flex>
       </td>
diff --git a/web/src/components/dashboard-alt/RunningProject.js b/web/src/components/dashboard-alt/RunningProject.js
index cda72f0e..90c1e1b4 100644
--- a/web/src/components/dashboard-alt/RunningProject.js
+++ b/web/src/components/dashboard-alt/RunningProject.js
@@ -1,8 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import { Media, Progress, Row, Col, Badge } from 'reactstrap';
+import { Media, Row, Col, Badge } from 'reactstrap';
 import Flex from '../common/Flex';
+import FalconProgress from '../common/FalconProgress';
 
 const RunningProject = ({ project, isLast }) => {
   const { color, progress, time, title } = project;
@@ -34,12 +35,11 @@ const RunningProject = ({ project, isLast }) => {
             <div className="fs--1 font-weight-semi-bold">{time}</div>
           </Col>
           <Col xs="5" className="pr-card">
-            <Progress
+            <FalconProgress
               value={progress}
               color="primary"
-              className="w-100 rounded-soft bg-200"
-              barClassName="rounded-capsule"
               style={{ height: '5px' }}
+              className="w-100 rounded-soft bg-200"
             />
           </Col>
         </Row>
diff --git a/web/src/components/dashboard-alt/StorageStatus.js b/web/src/components/dashboard-alt/StorageStatus.js
index 3c0cf104..5bd8af53 100644
--- a/web/src/components/dashboard-alt/StorageStatus.js
+++ b/web/src/components/dashboard-alt/StorageStatus.js
@@ -1,10 +1,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Card, CardBody, Progress, Row } from 'reactstrap';
+import { Card, CardBody, Row } from 'reactstrap';
 import Flex from '../common/Flex';
 import { isIterableArray } from '../../helpers/utils';
 import StorageStatusProgressBar from './StorageStatusProgressBar';
 import StorageStatusDot from './StorageStatusDot';
+import FalconProgress from '../common/FalconProgress';
 
 const StorageStatus = ({ data, className }) => {
   const totalStorage = data.map(d => d.size).reduce((total, currentValue) => total + currentValue, 0);
@@ -18,17 +19,19 @@ const StorageStatus = ({ data, className }) => {
             Using Storage <strong className="text-dark">{totalStorage - freeStorage} MB </strong>of{' '}
             {Math.round(totalStorage / 1024)} GB
           </h6>
-          <Progress multi className="rounded-soft mb-3" style={{ height: 10 }}>
+          <FalconProgress multi className="rounded-soft mb-3" style={{ height: '10px' }}>
             {isIterableArray(data) &&
-              data.map((d, index) => (
-                <StorageStatusProgressBar
-                  {...d}
-                  percentage={(d.size * 100) / totalStorage}
-                  isLast={data.length - 1 === index}
-                  key={index}
-                />
-              ))}
-          </Progress>
+              data.map((d, index) => {
+                return (
+                  <StorageStatusProgressBar
+                    {...d}
+                    percentage={(d.size * 100) / totalStorage}
+                    isLast={data.length - 1 === index}
+                    key={index}
+                  />
+                );
+              })}
+          </FalconProgress>
           <Row className="fs--1 font-weight-semi-bold text-500">
             {isIterableArray(data) &&
               data.map((d, index) => (
diff --git a/web/src/components/dashboard-alt/StorageStatusProgressBar.js b/web/src/components/dashboard-alt/StorageStatusProgressBar.js
index cd0e8ea2..42ef3a24 100644
--- a/web/src/components/dashboard-alt/StorageStatusProgressBar.js
+++ b/web/src/components/dashboard-alt/StorageStatusProgressBar.js
@@ -1,13 +1,13 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Progress } from 'reactstrap';
 import classNames from 'classnames';
+import FalconProgress from '../common/FalconProgressBar';
 
 const StorageStatusProgressBar = ({ color, percentage, isLast }) => (
-  <Progress
+  <FalconProgress
     bar
-    color={color}
     value={percentage}
+    color={color}
     className={classNames({ 'border-right border-white border-2x': !isLast })}
   />
 );
diff --git a/web/src/components/documentation/GettingStarted.js b/web/src/components/documentation/GettingStarted.js
index 1389a329..f71c9850 100644
--- a/web/src/components/documentation/GettingStarted.js
+++ b/web/src/components/documentation/GettingStarted.js
@@ -1,5 +1,6 @@
 import React, { Fragment } from 'react';
-import { Card, CardBody } from 'reactstrap';
+import { Card, CardBody, CardHeader, NavLink } from 'reactstrap';
+import CodeHighlight from '../common/CodeHighlight';
 import FalconCardHeader from '../common/FalconCardHeader';
 import PageHeader from '../common/PageHeader';
 
@@ -101,6 +102,40 @@ const GettingStarted = () => (
         </p>
       </CardBody>
     </Card>
+    <Card className="mb-3" id="setting-config">
+      <CardHeader className="bg-light">
+        <NavLink href="#setting-config" className="font-weight-semi-bold fs-1  p-0 text-900">
+          Settings configuration
+        </NavLink>
+      </CardHeader>
+      <CardBody>
+        <p>
+          Control side panel settings from one place. Go to <code>src/config.js</code> file and set your setting
+          configuration.
+        </p>
+        <CodeHighlight
+          code={`export const version = '2.8.0';
+export const navbarBreakPoint = 'xl'; // Vertical navbar breakpoint
+export const topNavbarBreakpoint = 'lg';
+export const settings = {
+  isFluid: false,
+  isRTL: false,
+  isDark: true,
+  isTopNav: true,
+  isVertical: false,
+  get isCombo() {
+    return this.isVertical && this.isTopNav;
+  },
+  showBurgerMenu: false, // controls showing vertical nav on mobile
+  currency: '$',
+  isNavbarVerticalCollapsed: false, // toggle vertical navbar collapse
+  navbarStyle: 'transparent'
+};
+export default { version, navbarBreakPoint, topNavbarBreakpoint, settings };`}
+          language="jsx"
+        />
+      </CardBody>
+    </Card>
     <Card className="mb-3">
       <FalconCardHeader title="Contents" />
       <CardBody>
diff --git a/web/src/components/e-commerce/Customers.js b/web/src/components/e-commerce/Customers.js
index 0cbd8b61..9a741aee 100644
--- a/web/src/components/e-commerce/Customers.js
+++ b/web/src/components/e-commerce/Customers.js
@@ -25,16 +25,18 @@ import { getPaginationArray } from '../../helpers/utils';
 
 import customers from '../../data/e-commerce/customers';
 
-const nameFormatter = (dataField, { name, avatar }: row) => (
-  <Link to="/pages/customer-details">
-    <Media tag={Flex} align="center">
-      <Avatar {...avatar} />
-      <Media body className="ml-2">
-        <h5 className="mb-0 fs--1">{name}</h5>
+const nameFormatter = (dataField, { avatar, name }) => {
+  return (
+    <Link to="/pages/customer-details">
+      <Media tag={Flex} align="center">
+        <Avatar {...avatar} />
+        <Media body className="ml-2">
+          <h5 className="mb-0 fs--1">{name}</h5>
+        </Media>
       </Media>
-    </Media>
-  </Link>
-);
+    </Link>
+  );
+};
 
 const emailFormatter = email => <a href={`mailto:${email}`}>{email}</a>;
 const phoneFormatter = phone => <a href={`tel:${phone}`}>{phone}</a>;
diff --git a/web/src/components/e-commerce/product-details/ProductDetailsFooter.js b/web/src/components/e-commerce/product-details/ProductDetailsFooter.js
index 4a66eae7..67f8b2ae 100644
--- a/web/src/components/e-commerce/product-details/ProductDetailsFooter.js
+++ b/web/src/components/e-commerce/product-details/ProductDetailsFooter.js
@@ -171,18 +171,13 @@ const ProductDetailsFooter = () => {
                       <StarCount stars={0} />
                     </FormGroup>
                     <FormGroup>
-                      <FalconInput label="Name:" onChange={({ target }) => console.log(target.value)} />
+                      <FalconInput label="Name:" onChange={value => console.log(value)} />
                     </FormGroup>
                     <FormGroup>
-                      <FalconInput label="Email:" onChange={({ target }) => console.log(target.value)} type="email" />
+                      <FalconInput label="Email:" onChange={value => console.log(value)} type="email" />
                     </FormGroup>
                     <FormGroup>
-                      <FalconInput
-                        label="Review:"
-                        onChange={({ target }) => console.log(target.value)}
-                        type="textarea"
-                        rows="2"
-                      />
+                      <FalconInput label="Review:" onChange={value => console.log(value)} type="textarea" rows="2" />
                     </FormGroup>
                     <Button color="primary" type="submit">
                       Submit
diff --git a/web/src/components/navbar/NavbarTop.js b/web/src/components/navbar/NavbarTop.js
index ec0f993b..de6c2471 100644
--- a/web/src/components/navbar/NavbarTop.js
+++ b/web/src/components/navbar/NavbarTop.js
@@ -1,4 +1,4 @@
-import React, { useContext, useState } from 'react';
+import React, { useContext } from 'react';
 import { Collapse, Navbar, NavItem, Nav } from 'reactstrap';
 import classNames from 'classnames';
 import AppContext from '../../context/Context';
@@ -9,26 +9,34 @@ import NavbarTopDropDownMenus from './NavbarTopDropDownMenus';
 import { navbarBreakPoint, topNavbarBreakpoint } from '../../config';
 
 const NavbarTop = () => {
-  const { showBurgerMenu, setShowBurgerMenu, isTopNav } = useContext(AppContext);
-  const [navbarCollapsed, setNavbarCollapsed] = useState(false);
-
+  const {
+    showBurgerMenu,
+    setShowBurgerMenu,
+    isTopNav,
+    isVertical,
+    isCombo,
+    navbarCollapsed,
+    setNavbarCollapsed
+  } = useContext(AppContext);
+  const handleBurgerMenu = () => {
+    isTopNav && !isCombo && setNavbarCollapsed(!navbarCollapsed);
+    (isCombo || isVertical) && setShowBurgerMenu(!showBurgerMenu);
+  };
   return (
     <Navbar
       light
       className="navbar-glass fs--1 font-weight-semi-bold row navbar-top sticky-kit"
-      expand={isTopNav ? topNavbarBreakpoint : navbarBreakPoint}
+      expand={topNavbarBreakpoint}
     >
       <div
         className={classNames('toggle-icon-wrapper mr-md-3 mr-2', {
-          'd-lg-none': isTopNav,
-          [`d-${navbarBreakPoint}-none`]: !isTopNav
+          'd-lg-none': isTopNav && !isCombo,
+          [`d-${navbarBreakPoint}-none`]: isVertical || isCombo
         })}
       >
         <button
-          className="navbar-toggler-humburger-icon btn btn-link d-flex align-item-center justify-content-center "
-          onClick={() => {
-            !isTopNav ? setShowBurgerMenu(!showBurgerMenu) : setNavbarCollapsed(!navbarCollapsed);
-          }}
+          className="navbar-toggler-humburger-icon btn btn-link d-flex flex-center"
+          onClick={handleBurgerMenu}
           id="burgerMenu"
         >
           <span className="navbar-toggle-icon">
diff --git a/web/src/components/navbar/NavbarVertical.js b/web/src/components/navbar/NavbarVertical.js
index 9b68ae5f..958f8fba 100644
--- a/web/src/components/navbar/NavbarVertical.js
+++ b/web/src/components/navbar/NavbarVertical.js
@@ -9,14 +9,22 @@ import ToggleButton from './ToggleButton';
 import AppContext from '../../context/Context';
 import Flex from '../common/Flex';
 import routes from '../../routes';
-import { navbarBreakPoint } from '../../config';
+import { navbarBreakPoint, topNavbarBreakpoint } from '../../config';
 
 import bgNavbarImg from '../../assets/img/generic/bg-navbar.png';
+import NavbarTopDropDownMenus from './NavbarTopDropDownMenus';
 
 const NavbarVertical = ({ navbarStyle }) => {
   const navBarRef = useRef(null);
 
-  const { showBurgerMenu, isNavbarVerticalCollapsed, setIsNavbarVerticalCollapsed } = useContext(AppContext);
+  const {
+    showBurgerMenu,
+    isNavbarVerticalCollapsed,
+    setIsNavbarVerticalCollapsed,
+    isCombo,
+    setShowBurgerMenu,
+    setNavbarCollapsed
+  } = useContext(AppContext);
 
   const HTMLClassList = document.getElementsByTagName('html')[0].classList;
   //Control Component did mount and unmounted of hover effect
@@ -48,7 +56,6 @@ const NavbarVertical = ({ navbarStyle }) => {
       }, 100);
     }
   };
-
   return (
     <Navbar
       expand={navbarBreakPoint}
@@ -85,10 +92,19 @@ const NavbarVertical = ({ navbarStyle }) => {
           <NavbarVerticalMenu routes={routes} />
         </Nav>
         <div className="settings px-3 px-xl-0">
+          {isCombo && (
+            <div className={`d-${topNavbarBreakpoint}-none`}>
+              <div className="navbar-vertical-divider">
+                <hr className="navbar-vertical-hr my-2" />
+              </div>
+              <Nav navbar>
+                <NavbarTopDropDownMenus setNavbarCollapsed={setNavbarCollapsed} setShowBurgerMenu={setShowBurgerMenu} />
+              </Nav>
+            </div>
+          )}
           <div className="navbar-vertical-divider">
             <hr className="navbar-vertical-hr my-2" />
           </div>
-
           <Button
             tag={'a'}
             href="https://myems.io"
@@ -101,8 +117,6 @@ const NavbarVertical = ({ navbarStyle }) => {
             Purchase
           </Button>
         </div>
-
-        {/* </Scrollbar> */}
       </Collapse>
     </Navbar>
   );
diff --git a/web/src/components/navbar/SettingsAnimatedIcon.js b/web/src/components/navbar/SettingsAnimatedIcon.js
index 98a68936..ba8948d3 100644
--- a/web/src/components/navbar/SettingsAnimatedIcon.js
+++ b/web/src/components/navbar/SettingsAnimatedIcon.js
@@ -1,13 +1,11 @@
 import React, { useContext } from 'react';
 import AppContext from '../../context/Context';
-import { Link } from 'react-router-dom';
 
 const SettingsAnimatedIcon = () => {
   const { toggleModal } = useContext(AppContext);
   return (
-    <Link
-      className="settings-popover nav-link"
-      to="#!"
+    <div
+      className="settings-popover nav-link cursor-pointer"
       onClick={() => {
         toggleModal();
       }}
@@ -23,7 +21,7 @@ const SettingsAnimatedIcon = () => {
           </svg>
         </span>
       </span>
-    </Link>
+    </div>
   );
 };
 
diff --git a/web/src/components/navbar/TopNavRightSideNavItem.js b/web/src/components/navbar/TopNavRightSideNavItem.js
index c790803c..c0b2154e 100644
--- a/web/src/components/navbar/TopNavRightSideNavItem.js
+++ b/web/src/components/navbar/TopNavRightSideNavItem.js
@@ -15,7 +15,17 @@ const TopNavRightSideNavItem = () => {
       <NavItem>
         <SettingsAnimatedIcon />
       </NavItem>
-      
+      {isTopNav && (
+        <NavItem className={`p-2 px-lg-0 cursor-pointer d-none d-sm-block`}>
+          <NavLink tag={Link} to="/changelog" id="changelog">
+            <FontAwesomeIcon icon="code-branch" transform="right-6 grow-4" />
+          </NavLink>
+          <UncontrolledTooltip autohide={false} placement="left" target="changelog">
+            Changelog
+          </UncontrolledTooltip>
+        </NavItem>
+      )}
+      <CartNotification />
       <NotificationDropdown />
       <ProfileDropdown />
     </Nav>
diff --git a/web/src/components/plugins/FontAwesome.js b/web/src/components/plugins/FontAwesome.js
index 0bd32b19..7016910f 100644
--- a/web/src/components/plugins/FontAwesome.js
+++ b/web/src/components/plugins/FontAwesome.js
@@ -4,6 +4,7 @@ import { Button, Card, CardBody } from 'reactstrap';
 import PageHeader from '../common/PageHeader';
 import FalconEditor from '../common/FalconEditor';
 import FalconCardHeader from '../common/FalconCardHeader';
+import CodeHighlight from '../common/CodeHighlight';
 
 const FontAwesome = () => (
   <Fragment>
@@ -24,11 +25,44 @@ const FontAwesome = () => (
         <FontAwesomeIcon icon="chevron-right" className="ml-1 fs--2" />
       </Button>
     </PageHeader>
-    <Card>
-      <FalconCardHeader title="Example" />
+    <Card className="mb-3">
+      <FalconCardHeader title="Add Icon" />
       <CardBody>
+        <p>
+          For adding new icon, go to <code>src/helpers/initFA.js</code> file. We initialize all fontawesome icons here.
+          Import your icon from your desired icon module and then pass it to <code>library.add()</code> function.
+        </p>
+        <CodeHighlight
+          code={`import { library } from '@fortawesome/fontawesome-svg-core'
+import { faGulp } from '@fortawesome/free-brands-svg-icons' // module
+import { faCheckSquare, faHome } from '@fortawesome/free-solid-svg-icons' // module
+ 
+library.add(faGulp, faCheckSquare, faHome)`}
+          language="jsx"
+        />
+        <p className="mb-0 mt-3">
+          For better understanding you can visit{' '}
+          <a href="https://www.npmjs.com/package/@fortawesome/react-fontawesome#usage">fontawesome usage</a>
+        </p>
+      </CardBody>
+    </Card>
+    <Card>
+      <FalconCardHeader title="Basic Usage" />
+      <CardBody>
+        <p>
+          Now in your component file just import the <code>FontAwesomeIcon</code> component, and when you use it, supply
+          the icon prop an icon name as a string
+        </p>
+        <CodeHighlight code={`import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';`} language="jsx" />
+        <br />
         <FalconEditor
-          code={`<FontAwesomeIcon icon="user" transform="grow-12 right-6" className="text-success" />`}
+          code={`<FontAwesomeIcon icon="home" className="text-success fs-2" />`}
+          scope={{ FontAwesomeIcon }}
+          language="jsx"
+        />
+        <br />
+        <FalconEditor
+          code={`<FontAwesomeIcon icon={['fab', 'gulp']}  className="text-danger fs-4" />`}
           scope={{ FontAwesomeIcon }}
           language="jsx"
         />
diff --git a/web/src/components/plugins/Leaflet.js b/web/src/components/plugins/Leaflet.js
index a07cc36d..7c9d1679 100644
--- a/web/src/components/plugins/Leaflet.js
+++ b/web/src/components/plugins/Leaflet.js
@@ -45,7 +45,7 @@ const leafletCode = `function LeafletMap  () {
     : ['bright:101%', 'contrast:101%', 'hue:23deg', 'saturate:225%'];
 
 
-  if(mapWidht){
+  if(mapWidth){
     useEffect(() => {
       L.tileLayer
         .colorFilter('https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png', {
@@ -63,7 +63,7 @@ const leafletCode = `function LeafletMap  () {
         maxZoom={18}
         zoomSnap={0.5}
         className="h-100 w-100"
-        style={{ width:mapWidht, minHeight: 300 }}
+        style={{ width:mapWidth, minHeight: 300 }}
         ref={map}
       >
         <MarkerCluster markers={markers} />
@@ -75,17 +75,17 @@ const leafletCode = `function LeafletMap  () {
 const Leaflet = () => {
   const { isDark } = useContext(AppContext);
   let map = useRef(null);
-  const [mapWidht, setMapwidth] = useState();
+  const [mapWidth, setMapWidth] = useState();
 
   const egMap = useRef();
   useEffect(() => {
     const timer = setTimeout(() => {
-      setMapwidth(egMap.current.offsetWidth);
+      setMapWidth(egMap.current.offsetWidth);
     }, 500);
     return () => {
       clearTimeout(timer);
     };
-  }, [isDark, mapWidht]);
+  }, [isDark, mapWidth]);
 
   return (
     <Fragment>
@@ -107,7 +107,7 @@ const Leaflet = () => {
         <CardBody className="p-0">
           <FalconEditor
             code={leafletCode}
-            scope={{ AppContext, MarkerCluster, Map, map, mapWidht, L }}
+            scope={{ AppContext, MarkerCluster, Map, map, mapWidth, L }}
             language="jsx"
           />
         </CardBody>
diff --git a/web/src/components/side-panel/SidePanelModal.js b/web/src/components/side-panel/SidePanelModal.js
index 3efe73a1..9947ecf1 100644
--- a/web/src/components/side-panel/SidePanelModal.js
+++ b/web/src/components/side-panel/SidePanelModal.js
@@ -24,6 +24,7 @@ import { withTranslation } from 'react-i18next';
 
 const SidePanelModal = ({ autoShow, showOnce, autoShowDelay, cookieExpireTime, path, t }) => {
   const {
+    isCombo,
     isOpenSidePanel,
     toggleModal,
     isFluid,
@@ -34,9 +35,11 @@ const SidePanelModal = ({ autoShow, showOnce, autoShowDelay, cookieExpireTime, p
     setIsDark,
     isTopNav,
     setIsTopNav,
-    setIsOpenSidePanel
+    setIsOpenSidePanel,
+    setIsCombo,
+    isVertical,
+    setIsVertical
   } = useContext(AppContext);
-
   const isKanban = getPageName('kanban');
 
   useEffect(() => {
@@ -49,7 +52,6 @@ const SidePanelModal = ({ autoShow, showOnce, autoShowDelay, cookieExpireTime, p
       }, autoShowDelay);
     }
   }, [autoShow, showOnce, setIsOpenSidePanel, autoShowDelay, cookieExpireTime]);
-
   return (
     <Modal
       isOpen={isOpenSidePanel}
@@ -157,28 +159,46 @@ const SidePanelModal = ({ autoShow, showOnce, autoShowDelay, cookieExpireTime, p
             <CustomInput
               type="radio"
               id="verticalNav-radio"
-              label={t('Vertical Nav')}
-              checked={!isTopNav}
-              onChange={({ target }) => setIsTopNav(!target.checked)}
+              label="Vertical"
+              name="NavBarPositionRadioButton"
+              checked={!isCombo && isVertical}
+              onChange={({ target }) => {
+                setIsVertical(target.checked);
+                setIsTopNav(!target.checked);
+                setIsCombo(!target.checked);
+              }}
               inline
             />
             <CustomInput
               type="radio"
               id="topNav-radio"
-              label={t('Top Nav')}
-              checked={isTopNav}
-              onChange={({ target }) => setIsTopNav(target.checked)}
+              label="Top"
+              name="NavBarPositionRadioButton"
+              checked={!isCombo && isTopNav}
+              onChange={({ target }) => {
+                setIsTopNav(target.checked);
+                setIsVertical(!target.checked);
+                setIsCombo(!target.checked);
+              }}
+              inline
+            />
+            <CustomInput
+              type="radio"
+              id="combo-radio"
+              label="Combo"
+              name="NavBarPositionRadioButton"
+              checked={isCombo}
+              onChange={({ target }) => {
+                setIsCombo(target.checked);
+                setIsTopNav(target.checked);
+                setIsVertical(target.checked);
+              }}
               inline
             />
           </Media>
         </Media>
         <hr />
-        <h5 className="fs-0 d-flex align-items-center">
-          {t('Vertical Navbar Style')}{' '}
-          <Badge pill color="soft-success" className="fs--2 ml-2">
-            new
-          </Badge>
-        </h5>
+        <h5 className="fs-0 d-flex align-items-center">{t('Vertical Navbar Style')}</h5>
         <p className="fs--1">{t('Switch between styles for your vertical navbar')}</p>
         <div className="btn-group-toggle btn-block btn-group-navbar-style">
           <ButtonGroup className="btn-block">
diff --git a/web/src/config.js b/web/src/config.js
index 62b49935..db538afe 100644
--- a/web/src/config.js
+++ b/web/src/config.js
@@ -3,3 +3,19 @@ export const navbarBreakPoint = 'xl'; // Vertical navbar breakpoint
 export const topNavbarBreakpoint = 'lg';
 //export const APIBaseURL = 'http://127.0.0.1:8000';
 export const APIBaseURL = window.location.protocol+"//"+window.location.hostname+":"+window.location.port+"/api";
+export const settings = {
+  isFluid: true,
+  isRTL: false,
+  isDark: true,
+  isTopNav: true,
+  isVertical: false,
+  get isCombo() {
+    return this.isVertical && this.isTopNav;
+  },
+  showBurgerMenu: false, // controls showing vertical nav on mobile
+  currency: '$',
+  isNavbarVerticalCollapsed: false,
+  navbarStyle: 'transparent',
+  language: 'zh_cn'
+};
+export default { version, navbarBreakPoint, topNavbarBreakpoint, settings, APIBaseURL };
\ No newline at end of file
diff --git a/web/src/context/Context.js b/web/src/context/Context.js
index 0d7fdc3d..c57e5509 100644
--- a/web/src/context/Context.js
+++ b/web/src/context/Context.js
@@ -1,15 +1,7 @@
 import { createContext } from 'react';
+import { settings } from '../config';
 
-const AppContext = createContext({
-  isFluid: true,
-  isRTL: false,
-  isDark: true,
-  showBurgerMenu: false, // controls showing vertical nav on mobile
-  currency: '$',
-  isNavbarVerticalCollapsed: false,
-  navbarStyle: 'vibrant',
-  language: 'zh_cn',
-});
+const AppContext = createContext(settings);
 
 export const EmailContext = createContext({ emails: [] });
 
diff --git a/web/src/layouts/DashboardLayout.js b/web/src/layouts/DashboardLayout.js
index 18566ac0..14ad61ac 100644
--- a/web/src/layouts/DashboardLayout.js
+++ b/web/src/layouts/DashboardLayout.js
@@ -17,7 +17,7 @@ import { getPageName } from '../helpers/utils';
 const DashboardRoutes = loadable(() => import('./MyEMSRoutes'));
 
 const DashboardLayout = ({ location }) => {
-  const { isFluid, isTopNav, navbarStyle } = useContext(AppContext);
+  const { isFluid, isVertical, navbarStyle } = useContext(AppContext);
 
   const isKanban = getPageName('kanban');
 
@@ -31,7 +31,7 @@ const DashboardLayout = ({ location }) => {
 
   return (
     <div className={isFluid || isKanban ? 'container-fluid' : 'container'}>
-      {!isTopNav && <NavbarVertical isKanban={isKanban} navbarStyle={navbarStyle} />}
+      {isVertical && <NavbarVertical isKanban={isKanban} navbarStyle={navbarStyle} />}
       <ProductProvider>
         <div className="content">
           <NavbarTop />
diff --git a/web/src/layouts/DashboardRoutes.js b/web/src/layouts/DashboardRoutes.js
index 05080acc..59c6a050 100644
--- a/web/src/layouts/DashboardRoutes.js
+++ b/web/src/layouts/DashboardRoutes.js
@@ -42,6 +42,7 @@ import ProgressBar from '../components/bootstrap-components/ProgressBar';
 import Tables from '../components/bootstrap-components/Tables';
 import Tooltips from '../components/bootstrap-components/Tooltips';
 import NavBarTop from '../components/bootstrap-components/NavBarTop';
+import Combo from '../components/bootstrap-components/Combo';
 import VerticalNavbar from '../components/bootstrap-components/VerticalNavbar';
 import Sidepanel from '../components/bootstrap-components/Sidepanel';
 import CookieNotice from '../components/bootstrap-components/CookieNotice';
@@ -191,6 +192,7 @@ const DashboardRoutes = () => (
     <Route path="/components/navs" exact component={Navs} />
     <Route path="/components/navbars" exact component={Navbars} />
     <Route path="/components/navbar-top" exact component={NavBarTop} />
+    <Route path="/components/combo" exact component={Combo} />
     <Route path="/components/navbar-vertical" exact component={VerticalNavbar} />
     <Route path="/components/Sidepanel" exact component={Sidepanel} />
     <Route path="/components/pageheaders" exact component={PageHeaders} />
@@ -229,7 +231,7 @@ const DashboardRoutes = () => (
     <Route path="/plugins/chart" exact component={Chart} />
     <Route path="/plugins/countup" exact component={CountUpExample} />
     <Route path="/plugins/datetime" exact component={DatetimeExample} />
-    <Route path="/plugins/fontawesome" exact component={FontAwesome} />
+    <Route path="/plugins/font-awesome" exact component={FontAwesome} />
     <Route path="/plugins/echarts" exact component={Echarts} />
     <Route path="/plugins/toastify" exact component={Toastify} />
     <Route path="/plugins/select" exact component={Select} />
diff --git a/web/src/layouts/Layout.js b/web/src/layouts/Layout.js
index 58858ff2..32234a22 100644
--- a/web/src/layouts/Layout.js
+++ b/web/src/layouts/Layout.js
@@ -26,11 +26,11 @@ const Layout = () => {
     <Router fallback={<span />}>
       <Switch>
         <Route path="/landing" exact component={Landing} />
-        <Route path="/authentication/basic" component={AuthBasicLayout} />
         <Route path="/authentication/card" component={AuthCardRoutes} />
         <Route path="/authentication/split" component={AuthSplitRoutes} />
         <Route path="/authentication/wizard" component={WizardLayout} />
         <Route path="/errors" component={ErrorLayout} />
+        <Route path="/authentication/basic" component={AuthBasicLayout} />
         <Route component={DashboardLayout} />
       </Switch>
       <ToastContainer transition={Fade} closeButton={<CloseButton />} position={toast.POSITION.BOTTOM_LEFT} />