diff --git a/resources/js/views/auth/SignIn.js b/resources/js/views/auth/SignIn.js
index bd00226..2a803a0 100755
--- a/resources/js/views/auth/SignIn.js
+++ b/resources/js/views/auth/SignIn.js
@@ -170,12 +170,7 @@ class SignIn extends Component {
                 message: {
                     type: 'error',
                     title: 'Something went wrong',
-                    body: (
-                        <h4>
-                            Oops? Something went wrong here.
-                            <br /> Please try again.
-                        </h4>
-                    ),
+                    body: 'Oops? Something went wrong here. Please try again.',
                     action: () => window.location.reload(),
                 },
             });
@@ -196,7 +191,7 @@ class SignIn extends Component {
     }
 
     render() {
-        const { classes, setErrors, errors: formErrors } = this.props;
+        const { classes, ...other } = this.props;
 
         const {
             loading,
@@ -208,7 +203,7 @@ class SignIn extends Component {
 
         return (
             <AuthLayout
-                {...this.props}
+                {...other}
                 title={
                     identified
                         ? Lang.get('navigation.signin_identified_title')
@@ -236,9 +231,6 @@ class SignIn extends Component {
                         password: '',
                     }}
                     onSubmit={this.handleSigninSubmit}
-                    validate={values => {
-                        setErrors({});
-                    }}
                     validationSchema={Yup.object().shape({
                         [!identified
                             ? 'username'
@@ -249,153 +241,147 @@ class SignIn extends Component {
                         ),
                     })}
                 >
-                    {({ values, handleChange, errors, isSubmitting }) => {
-                        if (formErrors && Object.keys(formErrors).length > 0) {
-                            errors = formErrors;
-                        }
-
-                        return (
-                            <Form>
-                                <Grid container direction="column">
-                                    {!identified ? (
-                                        <>
-                                            <Grid
-                                                item
-                                                className={classes.formGroup}
-                                            >
-                                                <TextField
-                                                    id="username"
-                                                    name="username"
-                                                    label="Username"
-                                                    placeholder="jovert123"
-                                                    value={values.username}
-                                                    onChange={handleChange}
-                                                    variant="outlined"
-                                                    fullWidth
-                                                    error={errors.hasOwnProperty(
+                    {({ values, handleChange, errors, isSubmitting }) => (
+                        <Form>
+                            <Grid container direction="column">
+                                {!identified ? (
+                                    <>
+                                        <Grid
+                                            item
+                                            className={classes.formGroup}
+                                        >
+                                            <TextField
+                                                id="username"
+                                                name="username"
+                                                label="Username"
+                                                placeholder="jovert123"
+                                                value={values.username}
+                                                onChange={handleChange}
+                                                variant="outlined"
+                                                fullWidth
+                                                error={errors.hasOwnProperty(
+                                                    'username',
+                                                )}
+                                                helperText={
+                                                    errors.hasOwnProperty(
                                                         'username',
-                                                    )}
-                                                    helperText={
-                                                        errors.hasOwnProperty(
-                                                            'username',
-                                                        ) && errors.username
-                                                    }
-                                                />
-                                            </Grid>
-
-                                            <Grid
-                                                item
-                                                className={classes.formGroup}
-                                            >
-                                                <Link to="#">
-                                                    {Lang.get(
-                                                        'navigation.forgot_email',
-                                                    )}
-                                                </Link>
-                                            </Grid>
-                                        </>
-                                    ) : (
-                                        <>
-                                            <Grid
-                                                item
-                                                className={classes.formGroup}
-                                            >
-                                                <TextField
-                                                    type={
-                                                        showPassword
-                                                            ? 'text'
-                                                            : 'password'
-                                                    }
-                                                    id="password"
-                                                    name="password"
-                                                    label="Password"
-                                                    placeholder="secret"
-                                                    value={values.password}
-                                                    onChange={handleChange}
-                                                    variant="outlined"
-                                                    fullWidth
-                                                    error={errors.hasOwnProperty(
+                                                    ) && errors.username
+                                                }
+                                            />
+                                        </Grid>
+
+                                        <Grid
+                                            item
+                                            className={classes.formGroup}
+                                        >
+                                            <Link to="#">
+                                                {Lang.get(
+                                                    'navigation.forgot_email',
+                                                )}
+                                            </Link>
+                                        </Grid>
+                                    </>
+                                ) : (
+                                    <>
+                                        <Grid
+                                            item
+                                            className={classes.formGroup}
+                                        >
+                                            <TextField
+                                                type={
+                                                    showPassword
+                                                        ? 'text'
+                                                        : 'password'
+                                                }
+                                                id="password"
+                                                name="password"
+                                                label="Password"
+                                                placeholder="secret"
+                                                value={values.password}
+                                                onChange={handleChange}
+                                                variant="outlined"
+                                                fullWidth
+                                                error={errors.hasOwnProperty(
+                                                    'password',
+                                                )}
+                                                helperText={
+                                                    errors.hasOwnProperty(
                                                         'password',
-                                                    )}
-                                                    helperText={
-                                                        errors.hasOwnProperty(
-                                                            'password',
-                                                        ) && errors.password
-                                                    }
-                                                    InputProps={{
-                                                        endAdornment: (
-                                                            <InputAdornment position="end">
-                                                                <IconButton
-                                                                    aria-label="Toggle password visibility"
-                                                                    onClick={
-                                                                        this
-                                                                            .handleShowPasswordClick
-                                                                    }
-                                                                >
-                                                                    {showPassword ? (
-                                                                        <VisibilityOffIcon />
-                                                                    ) : (
-                                                                        <VisibilityIcon />
-                                                                    )}
-                                                                </IconButton>
-                                                            </InputAdornment>
-                                                        ),
-                                                    }}
-                                                />
-                                            </Grid>
-
-                                            <Grid
-                                                item
-                                                className={classes.formGroup}
-                                            >
-                                                <Link
-                                                    component={props => (
-                                                        <RouterLink
-                                                            {...props}
-                                                            to={{
-                                                                search: UrlUtils._queryString(
-                                                                    {
-                                                                        username,
-                                                                    },
-                                                                ),
-                                                                pathname: NavigationUtils._route(
-                                                                    'auth.passwords.request',
-                                                                ),
-                                                            }}
-                                                        />
-                                                    )}
-                                                >
-                                                    {Lang.get(
-                                                        'navigation.forgot_password',
-                                                    )}
-                                                </Link>
-                                            </Grid>
-                                        </>
-                                    )}
-                                </Grid>
-
-                                <Grid container justify="space-between">
-                                    <Grid item />
-
-                                    <Grid item className={classes.formGroup}>
-                                        <Button
-                                            type="submit"
-                                            variant="contained"
-                                            color="primary"
-                                            disabled={
-                                                (errors &&
-                                                    Object.keys(errors).length >
-                                                        0) ||
-                                                isSubmitting
-                                            }
+                                                    ) && errors.password
+                                                }
+                                                InputProps={{
+                                                    endAdornment: (
+                                                        <InputAdornment position="end">
+                                                            <IconButton
+                                                                aria-label="Toggle password visibility"
+                                                                onClick={
+                                                                    this
+                                                                        .handleShowPasswordClick
+                                                                }
+                                                            >
+                                                                {showPassword ? (
+                                                                    <VisibilityOffIcon />
+                                                                ) : (
+                                                                    <VisibilityIcon />
+                                                                )}
+                                                            </IconButton>
+                                                        </InputAdornment>
+                                                    ),
+                                                }}
+                                            />
+                                        </Grid>
+
+                                        <Grid
+                                            item
+                                            className={classes.formGroup}
                                         >
-                                            {Lang.get('navigation.next')}
-                                        </Button>
-                                    </Grid>
+                                            <Link
+                                                component={props => (
+                                                    <RouterLink
+                                                        {...props}
+                                                        to={{
+                                                            search: UrlUtils._queryString(
+                                                                {
+                                                                    username,
+                                                                },
+                                                            ),
+                                                            pathname: NavigationUtils._route(
+                                                                'auth.passwords.request',
+                                                            ),
+                                                        }}
+                                                    />
+                                                )}
+                                            >
+                                                {Lang.get(
+                                                    'navigation.forgot_password',
+                                                )}
+                                            </Link>
+                                        </Grid>
+                                    </>
+                                )}
+                            </Grid>
+
+                            <Grid container justify="space-between">
+                                <Grid item />
+
+                                <Grid item className={classes.formGroup}>
+                                    <Button
+                                        type="submit"
+                                        variant="contained"
+                                        color="primary"
+                                        disabled={
+                                            (errors &&
+                                                Object.keys(errors).length >
+                                                    0) ||
+                                            isSubmitting
+                                        }
+                                    >
+                                        {Lang.get('navigation.next')}
+                                    </Button>
                                 </Grid>
-                            </Form>
-                        );
-                    }}
+                            </Grid>
+                        </Form>
+                    )}
                 </Formik>
             </AuthLayout>
         );
diff --git a/resources/js/views/auth/passwords/Request.js b/resources/js/views/auth/passwords/Request.js
index 883aada..a043938 100755
--- a/resources/js/views/auth/passwords/Request.js
+++ b/resources/js/views/auth/passwords/Request.js
@@ -39,7 +39,7 @@ class PasswordRequest extends Component {
             const { email } = values;
             const routeSuffix = NavigationUtils._route('auth.passwords.reset');
 
-            const response = await axios.post('api/v1/auth/password/request', {
+            await axios.post('api/v1/auth/password/request', {
                 email,
                 routeSuffix,
             });
@@ -90,12 +90,13 @@ class PasswordRequest extends Component {
     }
 
     render() {
-        const { classes, location } = this.props;
+        const { classes, ...other } = this.props;
+        const { location } = this.props;
         const { loading, message, email } = this.state;
 
         return (
             <AuthLayout
-                {...this.props}
+                {...other}
                 title={Lang.get('navigation.password_request_title')}
                 subTitle={Lang.get('navigation.password_request_subtitle')}
                 loading={loading}
diff --git a/resources/js/views/auth/passwords/Reset.js b/resources/js/views/auth/passwords/Reset.js
index eb76c96..9296bef 100755
--- a/resources/js/views/auth/passwords/Reset.js
+++ b/resources/js/views/auth/passwords/Reset.js
@@ -111,7 +111,7 @@ class PasswordReset extends Component {
     }
 
     render() {
-        const { classes } = this.props;
+        const { classes, ...other } = this.props;
 
         const {
             loading,
@@ -123,7 +123,7 @@ class PasswordReset extends Component {
 
         return (
             <AuthLayout
-                {...this.props}
+                {...other}
                 title={Lang.get('navigation.password_reset_title')}
                 subTitle={Lang.get('navigation.password_reset_subtitle')}
                 loading={loading}
diff --git a/resources/js/views/layouts/Auth.js b/resources/js/views/layouts/Auth.js
index 08d8080..b07e24e 100755
--- a/resources/js/views/layouts/Auth.js
+++ b/resources/js/views/layouts/Auth.js
@@ -1,17 +1,41 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import {
-    Grid,
-    Card,
-    Typography,
-    Button,
-    LinearProgress,
-    withStyles,
-} from '@material-ui/core';
+import { Grid, Card, Typography, Button, withStyles } from '@material-ui/core';
 
+import { LinearIndeterminate } from '../../ui/Loaders';
 import logoLight from '../../../img/logos/short-light.svg';
 import logoDark from '../../../img/logos/short-dark.svg';
 
+/**
+ * Format a given title
+ *
+ * @param {string} title The data that may need transformation
+ */
+const formattedTitle = title => {
+    if (typeof title === 'string') {
+        return (
+            <Typography variant="h5" component="h3">
+                {title}
+            </Typography>
+        );
+    }
+
+    return title;
+};
+
+/**
+ * Format a given subTitle
+ *
+ * @param {string} subTitle The data that may need transformation
+ */
+const formattedSubTitle = subTitle => {
+    if (typeof subTitle === 'string') {
+        return <Typography color="textSecondary">{subTitle}</Typography>;
+    }
+
+    return subTitle;
+};
+
 const Auth = props => (
     <Grid
         container
@@ -21,11 +45,7 @@ const Auth = props => (
     >
         <Grid item className={props.classes.content}>
             <>
-                {props.loading && (
-                    <span>
-                        <LinearProgress className={props.classes.progress} />
-                    </span>
-                )}
+                {props.loading && <LinearIndeterminate />}
 
                 <Card className={props.classes.form}>
                     <Grid
@@ -44,17 +64,13 @@ const Auth = props => (
 
                     <Grid container direction="column" justify="space-between">
                         <Grid item className={props.classes.heading}>
-                            <Typography variant="h5" component="h3">
-                                {props.message.hasOwnProperty('title')
-                                    ? props.message.title
-                                    : props.title}
-                            </Typography>
-
-                            <Typography color="textSecondary">
-                                {props.message.hasOwnProperty('body')
-                                    ? props.message.body
-                                    : props.subTitle}
-                            </Typography>
+                            {props.message.hasOwnProperty('title')
+                                ? formattedTitle(props.message.title)
+                                : formattedTitle(props.title)}
+
+                            {props.message.hasOwnProperty('body')
+                                ? formattedSubTitle(props.message.body)
+                                : formattedSubTitle(props.subTitle)}
                         </Grid>
 
                         {props.message.hasOwnProperty('type') ? (
@@ -98,35 +114,28 @@ const styles = theme => ({
     },
 
     content: {
-        width: '32rem',
+        width: 512,
     },
 
     form: {
-        padding: '1rem',
+        padding: 16,
         [theme.breakpoints.up('sm')]: {
-            padding: '2rem',
+            padding: 32,
             minHeight: '75vh',
         },
     },
 
-    progress: {
-        margin: '0 0.5rem',
-        minHeight: '0.5rem',
-        borderTopRightRadius: '100%',
-        borderTopLeftRadius: '100%',
-    },
-
     logoContainer: {
         textAlign: 'center',
     },
 
     logo: {
-        width: '5rem',
-        height: '5rem',
+        width: 80,
+        height: 80,
     },
 
     heading: {
-        margin: '2.5rem 0rem',
+        margin: '40px 0px',
         textAlign: 'center',
     },