diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index cac20dd..d61a9ee 100755
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -25,8 +25,6 @@ public function boot()
      */
     public function register()
     {
-        app()->bind('uploader', function () {
-            return new \App\Utils\Uploader;
-        });
+        //
     }
 }
diff --git a/resources/js/Backoffice.js b/resources/js/Backoffice.js
index 746088e..70d4de2 100755
--- a/resources/js/Backoffice.js
+++ b/resources/js/Backoffice.js
@@ -10,46 +10,11 @@ import { Loading } from './views';
 class Backoffice extends Component {
     state = {
         loading: true,
-        retrying: false,
-        navigating: true,
         authenticated: false,
         nightMode: false,
         token: {},
         user: {},
         username: '',
-
-        errorResponse: {},
-        successfulResponse: {},
-        responseInterceptor: null,
-    };
-
-    /**
-     * Refresh the user's session.
-     *
-     * @return {undefined}
-     */
-    refresh = async () => {
-        this.setState({ navigating: true });
-
-        try {
-            const response = await axios.post('/api/v1/auth/refresh');
-            const token = response.data;
-
-            this.setToken(token, true);
-
-            this.setState(prevState => {
-                return {
-                    navigating: false,
-                    token,
-
-                    // Update the user's auth_token after refreshing it in the API
-                    user: {
-                        ...prevState.user,
-                        auth_token: token.auth_token,
-                    },
-                };
-            });
-        } catch (error) {}
     };
 
     /**
@@ -62,11 +27,13 @@ class Backoffice extends Component {
     authenticate = async tokenString => {
         const token = JSON.parse(tokenString);
 
-        if (token) {
-            this.setToken(token);
-
-            await this.fetchUser();
+        if (token === {}) {
+            return;
         }
+
+        this.setToken(token);
+
+        await this.fetchUser();
     };
 
     /**
@@ -173,11 +140,10 @@ class Backoffice extends Component {
      * Store the authentication object as string into a persistent storage.
      *
      * @param {object} token
-     * @param {boolean} updateExpiry
      *
      * @return {undefined}
      */
-    setToken = (token, updateExpiry = false) => {
+    setToken = token => {
         // We will set a default Authorization header, this will
         // eliminate the need to include the Authorization header
         // for almost every AJAX requests.
@@ -185,14 +151,12 @@ class Backoffice extends Component {
             token.auth_token
         }`;
 
-        if (updateExpiry) {
-            // Add an expired_at timestamp based in the expired_in property in the token.
-            // A client defined expiry time makes sense here since a server time is
-            // not what we should depend on.
-            token.expired_at = moment()
-                .add(token.expires_in, 'seconds')
-                .format('YYYY-MM-DD hh:mm:ss');
-        }
+        // Add an expired_at timestamp based in the expired_in property in the token.
+        // A client defined expiry time makes sense here since a server time is
+        // not what we should depend on.
+        token.expired_at = moment()
+            .add(token.expires_in, 'seconds')
+            .format('YYYY-MM-DD hh:mm:ss');
 
         // Store it locally for the authentication token to persist.
         window.localStorage.setItem('token', JSON.stringify(token));
@@ -201,7 +165,7 @@ class Backoffice extends Component {
     /**
      * Fetch the authenticated user.
      *
-     * @return {undefined}
+     * @return {any}
      */
     fetchUser = async () => {
         this.setState({ loading: true });
@@ -209,95 +173,21 @@ class Backoffice extends Component {
         try {
             const response = await axios.post('/api/v1/auth/user');
 
-            if (response.status === 200) {
-                this.setState({
-                    loading: false,
-                    authenticated: true,
-                    user: response.data,
-                });
+            if (response.status !== 200) {
+                return;
             }
-        } catch (error) {}
-    };
-
-    /**
-     * Remove the response interceptor.
-     *
-     * @param {any} interceptor
-     *
-     * @param {undefined}
-     */
-    removeResponseInterceptor = interceptor => {
-        axios.interceptors.response.eject(interceptor);
-    };
 
-    /**
-     * Record API responses & do something.
-     *
-     * @param {any} interceptor
-     *
-     * @param {undefined}
-     */
-    addResponseInterceptor = () => {
-        const responseInterceptor = axios.interceptors.response.use(
-            response => {
-                return response;
-            },
-
-            async error => {
-                // In occasions of Unauthorized requests (401),
-                // Retry (if authenticated earlier).
-                if (error.response.status === 401 && this.state.authenticated) {
-                    this.setState({
-                        retrying: true,
-                    });
-
-                    // Request options
-                    const {
-                        url,
-                        method,
-                        headers,
-                        params: data,
-                    } = error.response.config;
-
-                    const response = await axios({
-                        url,
-                        method,
-                        headers: {
-                            ...headers,
-
-                            // This is an override of the Authorization header
-                            // to fix the 401 errors when we retry.
-                            Authorization:
-                                window.axios.defaults.headers.common[
-                                    'Authorization'
-                                ],
-                        },
-                        data,
-                    });
-
-                    // If the request returns 200 or 201 (Resource created),
-                    // Treat it as successful response.
-                    if ([200, 201].indexOf(response.status) > -1) {
-                        this.setState({
-                            retrying: false,
-                            successfulResponse: response,
-                        });
-                    }
-                }
-
-                return Promise.reject(error);
-            },
-        );
+            this.setState({
+                loading: false,
+                authenticated: true,
+                user: response.data,
+            });
 
-        this.setState({
-            responseInterceptor,
-        });
+            return response.data;
+        } catch (error) {}
     };
 
     async componentDidMount() {
-        // Listen for all API responses.
-        this.addResponseInterceptor();
-
         // Setup Night Mode via Persistent Storage.
         this.setNightMode();
 
@@ -306,20 +196,14 @@ class Backoffice extends Component {
         let expired = true;
 
         if (token.hasOwnProperty('expired_at')) {
-            expired = token.expired_at < moment().format('YYYY-MM-DD hh:mm:ss');
+            expired = moment(token.expired_at).unix() > moment().unix();
         }
 
         if (!expired) {
             await this.authenticate(JSON.stringify(token));
         }
 
-        this.setState({ loading: false, navigating: false });
-    }
-
-    componentWillUnmount() {
-        const { responseInterceptor } = this.state;
-
-        this.removeResponseInterceptor(responseInterceptor);
+        this.setState({ loading: false });
     }
 
     render() {
@@ -346,7 +230,6 @@ class Backoffice extends Component {
                                 routes: ROUTES,
                                 handleNightmodeToggled: this
                                     .handleNightmodeToggled,
-                                refresh: this.refresh,
                                 authenticate: this.authenticate,
                                 handleLock: this.handleLock,
                                 handleSignout: this.handleSignout,
diff --git a/resources/js/core/Navigator.js b/resources/js/core/Navigator.js
index ca839d7..4be9ad4 100755
--- a/resources/js/core/Navigator.js
+++ b/resources/js/core/Navigator.js
@@ -1,82 +1,61 @@
-import React, { Component } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 import { withRouter, Route, Switch, Redirect } from 'react-router-dom';
 
 import * as NavigationUtils from '../utils/Navigation';
 import * as UrlUtils from '../utils/URL';
 
-class Navigator extends Component {
-    async componentDidUpdate(prevProps) {
-        const { location, pageProps } = this.props;
+const Navigator = props => {
+    const { authenticated, username, environment, routes } = props.pageProps;
 
-        // notify the parent component that the user is navigating...
-        if (location.pathname !== prevProps.location.pathname) {
-            await pageProps.refresh();
-        }
-    }
+    return (
+        <Switch>
+            {routes.map((route, i) => {
+                const View = route.component;
 
-    render() {
-        const {
-            authenticated,
-            username,
-            environment,
-            routes,
-        } = this.props.pageProps;
-
-        return (
-            <Switch>
-                {routes.map((route, i) => {
-                    const View = route.component;
-
-                    return (
-                        <Route
-                            key={i}
-                            path={route.path}
-                            exact
-                            render={routeProps => {
-                                if (route.auth) {
-                                    if (!authenticated) {
-                                        return (
-                                            <Redirect
-                                                to={{
-                                                    search: UrlUtils._queryString(
-                                                        {
-                                                            username,
-                                                        },
-                                                    ),
-                                                    pathname: NavigationUtils._route(
-                                                        'auth.signin',
-                                                    ),
-                                                }}
-                                            />
-                                        );
-                                    }
+                return (
+                    <Route
+                        key={i}
+                        path={route.path}
+                        exact
+                        render={routeProps => {
+                            if (route.auth) {
+                                if (!authenticated) {
+                                    return (
+                                        <Redirect
+                                            to={{
+                                                search: UrlUtils._queryString({
+                                                    username,
+                                                }),
+                                                pathname: NavigationUtils._route(
+                                                    'auth.signin',
+                                                ),
+                                            }}
+                                        />
+                                    );
                                 }
+                            }
 
-                                if (
-                                    !route.auth &&
-                                    route.hasOwnProperty('path')
-                                ) {
-                                    if (authenticated) {
-                                        return (
-                                            <Redirect
-                                                to={NavigationUtils._route(
-                                                    `${environment}.home`,
-                                                )}
-                                            />
-                                        );
-                                    }
+                            if (!route.auth && route.hasOwnProperty('path')) {
+                                if (authenticated) {
+                                    return (
+                                        <Redirect
+                                            to={NavigationUtils._route(
+                                                `${environment}.home`,
+                                            )}
+                                        />
+                                    );
                                 }
+                            }
 
-                                return <View {...this.props} {...routeProps} />;
-                            }}
-                        />
-                    );
-                })}
-            </Switch>
-        );
-    }
-}
+                            return <View {...props} {...routeProps} />;
+                        }}
+                    />
+                );
+            })}
+        </Switch>
+    );
+};
 
 Navigator.propTypes = {
     pageProps: PropTypes.object.isRequired,
diff --git a/resources/js/views/__backoffice/layouts/Master.js b/resources/js/views/__backoffice/layouts/Master.js
index f905851..edadb3a 100755
--- a/resources/js/views/__backoffice/layouts/Master.js
+++ b/resources/js/views/__backoffice/layouts/Master.js
@@ -96,17 +96,18 @@ class Master extends Component {
     }
 
     render() {
+        const { classes, ...childProps } = this.props;
+
         const {
-            classes,
-            children,
             history,
             location,
+            children,
             pageProps,
             loading,
             message,
             alert,
         } = this.props;
-        const { navigating, nightMode } = pageProps;
+        const { nightMode } = pageProps;
 
         const { mobileOpen, message: globalMessage } = this.state;
 
@@ -130,7 +131,7 @@ class Master extends Component {
 
         return (
             <>
-                {navigating && <LinearDeterminate className={classes.loader} />}
+                {loading && <LinearDeterminate className={classes.loader} />}
 
                 <div className={classes.root}>
                     <CssBaseline />
@@ -138,7 +139,9 @@ class Master extends Component {
                     <nav className={classes.drawer}>
                         <Hidden smUp implementation="js">
                             <Sidebar
-                                pageProps={pageProps}
+                                {...childProps}
+                                {...this.state}
+                                loading={loading}
                                 PaperProps={{ style: { width: drawerWidth } }}
                                 variant="temporary"
                                 open={mobileOpen}
@@ -150,9 +153,10 @@ class Master extends Component {
 
                         <Hidden xsDown implementation="css">
                             <Sidebar
-                                pageProps={pageProps}
+                                {...childProps}
+                                {...this.state}
+                                loading={loading}
                                 PaperProps={{ style: { width: drawerWidth } }}
-                                locationPathname={location.pathname}
                                 navigate={path => history.push(path)}
                             />
                         </Hidden>
@@ -160,13 +164,11 @@ class Master extends Component {
 
                     <div className={classes.contentWrapper}>
                         <Header
-                            parentProps={{
-                                ...this.props,
-                                ...this.state,
-                                onDrawerToggle: this.handleDrawerToggled,
-                                onNavLinkMenuToggle: this
-                                    .handleNavLinkMenuToggled,
-                            }}
+                            {...childProps}
+                            {...this.state}
+                            loading={loading}
+                            onDrawerToggle={this.handleDrawerToggled}
+                            onNavLinkMenuToggle={this.handleNavLinkMenuToggled}
                         />
 
                         <AppBar
@@ -256,7 +258,7 @@ class Master extends Component {
                         </AppBar>
 
                         <main className={classes.content}>
-                            {loading || navigating ? (
+                            {loading ? (
                                 renderLoading
                             ) : (
                                 <Grid container>{children}</Grid>
@@ -296,6 +298,7 @@ class Master extends Component {
 
 Master.propTypes = {
     classes: PropTypes.object.isRequired,
+    loading: PropTypes.bool,
     pageProps: PropTypes.object.isRequired,
     pageTitle: PropTypes.string.isRequired,
     primaryAction: PropTypes.object,
diff --git a/resources/js/views/__backoffice/partials/Header.js b/resources/js/views/__backoffice/partials/Header.js
index ff6d8f9..6880dfb 100644
--- a/resources/js/views/__backoffice/partials/Header.js
+++ b/resources/js/views/__backoffice/partials/Header.js
@@ -45,8 +45,7 @@ import { Ph as PhIcon, Us as UsIcon } from '../../../icons/flags/4x3';
 import { Skeleton } from '../../../ui';
 
 const LocaleMenu = props => {
-    const { classes, parentProps } = props;
-    const { localeMenuOpen, localeMenuEl } = parentProps;
+    const { classes, localeMenuOpen, localeMenuEl } = props;
 
     return (
         <Popper
@@ -69,9 +68,7 @@ const LocaleMenu = props => {
                     <Paper>
                         <ClickAwayListener
                             onClickAway={() =>
-                                props.parentProps.onNavLinkMenuToggle(
-                                    'localeMenuOpen',
-                                )
+                                props.onNavLinkMenuToggle('localeMenuOpen')
                             }
                         >
                             <MenuList>
@@ -128,9 +125,7 @@ const LocaleMenu = props => {
 };
 
 const AccountMenu = props => {
-    const { classes, parentProps } = props;
-    const { pageProps, accountMenuOpen, accountMenuEl } = parentProps;
-
+    const { classes, accountMenuOpen, accountMenuEl, pageProps } = props;
     const { user, handleLock, handleSignout } = pageProps;
 
     return (
@@ -154,9 +149,7 @@ const AccountMenu = props => {
                     <Paper>
                         <ClickAwayListener
                             onClickAway={() =>
-                                props.parentProps.onNavLinkMenuToggle(
-                                    'accountMenuOpen',
-                                )
+                                props.onNavLinkMenuToggle('accountMenuOpen')
                             }
                         >
                             <MenuList>
@@ -225,8 +218,9 @@ const AccountMenu = props => {
 };
 
 const Header = props => {
-    const { classes, parentProps } = props;
     const {
+        classes,
+        loading,
         onDrawerToggle,
         pageProps,
         pageTitle,
@@ -234,9 +228,9 @@ const Header = props => {
         tabs,
         localeMenuOpen,
         accountMenuOpen,
-    } = parentProps;
+    } = props;
 
-    const { user, navigating, nightMode, handleNightmodeToggled } = pageProps;
+    const { user, nightMode, handleNightmodeToggled } = pageProps;
 
     const skeletonProps = {
         color: colors.grey[400],
@@ -463,7 +457,7 @@ const Header = props => {
                                         }
                                         aria-haspopup="true"
                                         onClick={() =>
-                                            props.parentProps.onNavLinkMenuToggle(
+                                            props.onNavLinkMenuToggle(
                                                 'localeMenuOpen',
                                             )
                                         }
@@ -507,7 +501,7 @@ const Header = props => {
                                         }
                                         aria-haspopup="true"
                                         onClick={() =>
-                                            props.parentProps.onNavLinkMenuToggle(
+                                            props.onNavLinkMenuToggle(
                                                 'accountMenuOpen',
                                             )
                                         }
@@ -586,12 +580,11 @@ const Header = props => {
         </>
     );
 
-    return <>{navigating ? renderNavigating : renderNavigated}</>;
+    return <>{loading ? renderNavigating : renderNavigated}</>;
 };
 
 Header.propTypes = {
     classes: PropTypes.object.isRequired,
-    parentProps: PropTypes.object.isRequired,
 };
 
 const lightColor = 'rgba(255, 255, 255, 0.7)';
diff --git a/resources/js/views/__backoffice/partials/Sidebar.js b/resources/js/views/__backoffice/partials/Sidebar.js
index 3401a70..f78dfad 100644
--- a/resources/js/views/__backoffice/partials/Sidebar.js
+++ b/resources/js/views/__backoffice/partials/Sidebar.js
@@ -25,7 +25,7 @@ import brandLogoLight from '../../../../img/logos/full-light.svg';
 import brandLogoDark from '../../../../img/logos/full-dark.svg';
 
 const Sidebar = props => {
-    const { classes, locationPathname, pageProps, navigate, ...other } = props;
+    const { classes, location, pageProps, loading, navigate } = props;
     const { nightMode } = pageProps;
 
     const homeLink = {
@@ -47,9 +47,9 @@ const Sidebar = props => {
         },
     ];
 
-    const renderNavigating = (
-        <div>
-            <div
+    const renderLoading = (
+        <List disablePadding className={classes.links}>
+            <ListItem
                 className={classNames(
                     classes.brand,
                     classes.link,
@@ -62,11 +62,11 @@ const Sidebar = props => {
                     color={nightMode && colors.grey['A700']}
                     highlightColor={nightMode && colors.grey['A400']}
                 />
-            </div>
+            </ListItem>
 
             <Divider className={classes.topDivider} />
 
-            <div
+            <ListItem
                 className={classNames(
                     classes.link,
                     classes.linkGroup,
@@ -91,11 +91,11 @@ const Sidebar = props => {
                         highlightColor={nightMode && colors.grey['A400']}
                     />
                 </span>
-            </div>
+            </ListItem>
 
             {linkGroups.map(({ name, links }) => (
                 <React.Fragment key={name}>
-                    <div
+                    <ListItem
                         className={classNames(
                             classes.linkGroupHeader,
                             classes.linkLoading,
@@ -106,10 +106,10 @@ const Sidebar = props => {
                             color={nightMode && colors.grey['A700']}
                             highlightColor={nightMode && colors.grey['A400']}
                         />
-                    </div>
+                    </ListItem>
 
                     {links.map(({ name }) => (
-                        <div
+                        <ListItem
                             key={name}
                             className={classNames(
                                 classes.link,
@@ -138,17 +138,17 @@ const Sidebar = props => {
                                     }
                                 />
                             </span>
-                        </div>
+                        </ListItem>
                     ))}
 
                     <Divider className={classes.divider} />
                 </React.Fragment>
             ))}
-        </div>
+        </List>
     );
 
     const renderNavigated = (
-        <List disablePadding>
+        <List disablePadding className={classes.links}>
             <ListItem
                 className={classNames(
                     classes.brand,
@@ -172,7 +172,7 @@ const Sidebar = props => {
                     classes.link,
                     classes.linkGroup,
                     classes.linkActionable,
-                    locationPathname === homeLink.path && classes.linkActive,
+                    location.pathname === homeLink.path && classes.linkActive,
                 )}
                 onClick={() => navigate(homeLink.path)}
             >
@@ -207,7 +207,8 @@ const Sidebar = props => {
                             className={classNames(
                                 classes.link,
                                 classes.linkActionable,
-                                locationPathname === path && classes.linkActive,
+                                location.pathname === path &&
+                                    classes.linkActive,
                             )}
                             onClick={() => navigate(path)}
                         >
@@ -231,8 +232,8 @@ const Sidebar = props => {
     );
 
     return (
-        <Drawer variant="permanent" {...other}>
-            {pageProps.navigating ? renderNavigating : renderNavigated}
+        <Drawer variant="permanent">
+            {loading ? renderLoading : renderNavigated}
         </Drawer>
     );
 };
@@ -240,10 +241,16 @@ const Sidebar = props => {
 Sidebar.propTypes = {
     classes: PropTypes.object.isRequired,
     pageProps: PropTypes.object.isRequired,
-    locationPathname: PropTypes.string,
 };
 
 const styles = theme => ({
+    links: {
+        [theme.breakpoints.up('sm')]: {
+            width: 256,
+            flexShrink: 0,
+        },
+    },
+
     brand: {
         fontSize: 24,
         fontFamily: theme.typography.fontFamily,
diff --git a/resources/js/views/__backoffice/users/List.js b/resources/js/views/__backoffice/users/List.js
index c830cf8..598b811 100755
--- a/resources/js/views/__backoffice/users/List.js
+++ b/resources/js/views/__backoffice/users/List.js
@@ -347,17 +347,15 @@ class List extends Component {
     }
 
     render() {
+        const { ...childProps } = this.props;
+
+        const { pageProps } = this.props;
+        const { user: authUser } = pageProps;
+
         const { loading, sorting, filters, message, alert } = this.state;
 
         let { pagination } = this.state;
 
-        // Use the response data from the successful response (result of retry
-        // on failed (401) API requests) for pagination.
-        const { successfulResponse: response, retrying } = this.props.pageProps;
-        if (response.hasOwnProperty('data') && !retrying) {
-            pagination = response.data;
-        }
-
         const {
             data: rawData,
             total,
@@ -365,9 +363,6 @@ class List extends Component {
             current_page: page,
         } = pagination;
 
-        const { pageProps, history } = this.props;
-        const { user: authUser } = pageProps;
-
         const primaryAction = {
             text: Lang.get('resources.create', {
                 name: 'User',
@@ -477,11 +472,12 @@ class List extends Component {
 
         return (
             <MasterLayout
-                {...this.props}
+                {...childProps}
+                loading={this.state.loading}
                 pageTitle={Lang.get('navigation.users')}
                 primaryAction={primaryAction}
                 tabs={tabs}
-                loading={loading || pageProps.retrying}
+                loading={loading}
                 message={message}
                 alert={alert}
             >