diff --git a/README.md b/README.md
index 5c98b461..ad5d31a8 100644
--- a/README.md
+++ b/README.md
@@ -187,6 +187,7 @@ go build
 * **Mitch Roote** - [roote.ca](https://roote.ca)
 
 ## Special Thanks
+- **[All Contributions]**(https://github.com/mroote/factorio-server-manager/graphs/contributors)
 - **mickael9** for reverseengineering the factorio-save-file: https://forums.factorio.com/viewtopic.php?f=5&t=8568#
 
 ## License
diff --git a/package.json b/package.json
index 282cb2df..85932f1e 100644
--- a/package.json
+++ b/package.json
@@ -24,35 +24,35 @@
   },
   "homepage": "https://github.com/mroote/factorio-server-manager#readme",
   "devDependencies": {
-    "@babel/core": "^7.2.2",
-    "@babel/preset-env": "^7.2.3",
+    "@babel/core": "^7.4.5",
+    "@babel/preset-env": "^7.4.5",
     "@babel/preset-react": "^7.0.0",
-    "@fortawesome/fontawesome-free": "^5.6.3",
+    "@fortawesome/fontawesome-free": "^5.8.2",
     "admin-lte": "^3.0.0-alpha.2",
-    "babel-loader": "^8.0.5",
-    "bootstrap": "^4.2.1",
-    "bootstrap-fileinput": "^4.5.2",
+    "babel-loader": "^8.0.6",
+    "bootstrap": "^4.3.1",
+    "bootstrap-fileinput": "^5.0.3",
     "classnames": "^2.2.6",
     "css-loader": "^2.1.0",
     "file-loader": "^3.0.1",
-    "jquery": "^3.3.1",
+    "jquery": "^3.4.1",
     "locks": "^0.2.2",
-    "mini-css-extract-plugin": "^0.5.0",
-    "node-sass": "^4.11.0",
+    "mini-css-extract-plugin": "^0.7.0",
+    "node-sass": "^4.12.0",
     "optimize-css-assets-webpack-plugin": "^5.0.1",
-    "prop-types": "^15.6.2",
-    "react": "^16.7.0",
-    "react-dom": "^16.7.0",
-    "react-native-listener": "^1.0.2",
-    "react-router": "^4.3.1",
-    "react-router-dom": "^4.3.1",
-    "resolve-url-loader": "^3.0.0",
+    "prop-types": "^15.7.2",
+    "react": "^16.8.6",
+    "react-dom": "^16.8.6",
+    "react-native-listener": "^1.1.0",
+    "react-router": "^5.0.0",
+    "react-router-dom": "^5.0.0",
+    "resolve-url-loader": "^3.1.0",
     "sass-loader": "^7.1.0",
-    "semver": "^5.6.0",
-    "sweetalert2": "^7.33.1",
-    "sweetalert2-react-content": "^1.0.1",
-    "webpack": "^4.28.4",
-    "webpack-cli": "^3.2.1",
-    "webpack-fix-style-only-entries": "0.1.0"
+    "semver": "^6.1.1",
+    "sweetalert2": "^8.11.6",
+    "sweetalert2-react-content": "^1.1.0",
+    "webpack": "^4.32.2",
+    "webpack-cli": "^3.3.2",
+    "webpack-fix-style-only-entries": "^0.2.0"
   }
 }
diff --git a/ui/App/App.jsx b/ui/App/App.jsx
index d4c135bc..b27d923c 100644
--- a/ui/App/App.jsx
+++ b/ui/App/App.jsx
@@ -128,7 +128,6 @@ class App extends React.Component {
             url: "/api/server/facVersion",
             // dataType: "json",
             success: (data) => {
-                console.log(data);
                 this.setState({
                     factorioVersion: data.data.base_mod_version
                 });
diff --git a/ui/App/components/LoginContent.jsx b/ui/App/components/LoginContent.jsx
index 946dd370..947da44f 100644
--- a/ui/App/components/LoginContent.jsx
+++ b/ui/App/components/LoginContent.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import {withRouter} from 'react-router-dom';
+import FontAwesomeIcon from "./FontAwesomeIcon";
 
 class LoginContent extends React.Component {
     constructor(props) {
@@ -30,54 +31,43 @@ class LoginContent extends React.Component {
 
     render() {
         return(
-            <div className="container ">
-                <div className="row">
-                    <div className="absolute-center is-responsive">
-                        <div className="col-centered col-md-4 col-mod-offset-2">
-                            <div className="center-block">
-                                <section className="content-header">
-                                <h1>
-                                    Factorio Server Manager
-                                    <small>Login to manage Factorio</small>
-                                </h1>
-                                </section>
-
-                                <section className="content">
-                                <div className="row">
-                                    <div className="login-box-body">
+            <div className="container" id="login">
+                <div className="d-flex justify-content-center h-100">
+                    <div className="card">
+                        <div className="card-header">
+                            <h1>
+                                <img src="./images/factorio.jpg" className="img-circle" alt="User Image"/>
+                                Factorio Server Manager
+                            </h1>
+                        </div>
 
-                                        <form onSubmit={this.loginUser}>
-                                            <div className="form-group has-feedback">
-                                                <input type="text" ref="username" className="form-control" placeholder="Username" />
-                                                <span className="fa fa-envelope form-control-feedback"></span>
-                                            </div>
-                                            <div className="form-group has-feedback">
-                                                <input type="password" ref="password" className="form-control" placeholder="Password" />
-                                                <span className="fa fa-lock form-control-feedback"></span>
-                                            </div>
-                                            <div className="row">
-                                                <div className="col-xs-8">
-                                                    <div className="checkbox">
-                                                        <label className="">
-                                                            <div className="" aria-checked="false" aria-disabled="false" style={{position: "relative"}}>
-                                                            <input type="checkbox"/>
-                                                            </div> Remember Me
-                                                        </label>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div className="row">
-                                                <div className="col-xs-4">
-                                                    <button type="submit" className="btn btn-primary btn-block btn-flat">Sign In</button>
-                                                </div>
-                                            </div>
-                                        </form>
+                        <div className="car-body">
+                            <form onSubmit={this.loginUser}>
+                                <label className="input-group form-group">
+                                    <div className="input-group-prepend">
+                                        <span className="input-group-text">
+                                            <FontAwesomeIcon icon="user"/>
+                                        </span>
+                                    </div>
+                                    <input className="form-control" type="text" ref="username" placeholder="Username"/>
+                                </label>
 
-                                        <a href="#">I forgot my password</a><br />
+                                <label className="input-group form-group">
+                                    <div className="input-group-prepend">
+                                        <span className="input-group-text">
+                                            <FontAwesomeIcon icon="lock"/>
+                                        </span>
                                     </div>
-                                </div>
-                                </section>
-                            </div>
+                                    <input className="form-control" type="password" ref="password" placeholder="Password"/>
+                                </label>
+
+                                <label className="remember-me">
+                                    <input type="checkbox"/>&nbsp;
+                                    Remember me
+                                </label>
+
+                                <input type="submit" value="Sign In" className="btn btn-primary btn-block btn-flat"/>
+                            </form>
                         </div>
                     </div>
                 </div>
diff --git a/ui/App/components/Mods/packs/ModPackOverview.jsx b/ui/App/components/Mods/packs/ModPackOverview.jsx
index e0be241a..9e16d98b 100644
--- a/ui/App/components/Mods/packs/ModPackOverview.jsx
+++ b/ui/App/components/Mods/packs/ModPackOverview.jsx
@@ -224,7 +224,7 @@ class ModPackOverview extends React.Component {
 
 
         if(updatesInProgress) {
-            ReactSwalNormal.fir({
+            ReactSwalNormal.fire({
                 title: "Toggle mod failed",
                 text: "Can't toggle the mod, when an update is still in progress",
                 type: "error"
diff --git a/ui/App/components/ModsContent.jsx b/ui/App/components/ModsContent.jsx
index 83ea348e..c50318e9 100644
--- a/ui/App/components/ModsContent.jsx
+++ b/ui/App/components/ModsContent.jsx
@@ -336,7 +336,7 @@ class ModsContent extends React.Component {
         let $row = $button.parents("tr");
         let modName = $row.data("mod-name");
 
-        ReactSwalDanger({
+        ReactSwalDanger.fire({
             title: "Delete Mod?",
             text: "This will delete the mod and can break the save file",
             type: "question",
diff --git a/ui/index.scss b/ui/index.scss
index 167b6761..4817d240 100644
--- a/ui/index.scss
+++ b/ui/index.scss
@@ -32,4 +32,5 @@
  */
 @import "scss/pages/serverCtl";
 @import "scss/pages/logs";
-@import "scss/pages/saves";
\ No newline at end of file
+@import "scss/pages/saves";
+@import "scss/pages/login";
diff --git a/ui/scss/customizations/form.scss b/ui/scss/customizations/form.scss
index 3f48d4f6..e4cae73f 100644
--- a/ui/scss/customizations/form.scss
+++ b/ui/scss/customizations/form.scss
@@ -1,3 +1,7 @@
 input.form-control {
     border-radius: 0;
-}
\ No newline at end of file
+}
+
+.input-group-text {
+    border-radius: 0;
+}
diff --git a/ui/scss/pages/login.scss b/ui/scss/pages/login.scss
new file mode 100644
index 00000000..d430ded1
--- /dev/null
+++ b/ui/scss/pages/login.scss
@@ -0,0 +1,22 @@
+#login {
+    .card {
+        border: none;
+
+        .card-header h1 {
+            display: flex;
+            align-items: center;
+
+            img {
+                width: 4rem;
+            }
+        }
+
+        .remember-me {
+            @extend .row;
+            @extend .align-items-center;
+
+            margin-left: 0;
+            margin-right: 0;
+        }
+    }
+}