diff --git a/client/assets/scss/Content.scss b/client/assets/scss/Content.scss
index bc55bf8..a6bc995 100644
--- a/client/assets/scss/Content.scss
+++ b/client/assets/scss/Content.scss
@@ -1,5 +1,6 @@
 .Content {
   flex: 1;
+  flex-wrap: wrap;
     .post + .post {
         margin-top: 2em;
     }
@@ -23,4 +24,8 @@
         height: auto;
         margin: auto;
     }
+    code,
+    pre {
+        white-space: pre-wrap;
+    }
 }
diff --git a/client/assets/scss/Footer.scss b/client/assets/scss/Footer.scss
index d46556d..061b49d 100644
--- a/client/assets/scss/Footer.scss
+++ b/client/assets/scss/Footer.scss
@@ -1,6 +1,6 @@
 .Footer {
     height: 5em;
-    line-height: 5em;
+    align-items: center;
     background-color: #F1F1F1;
     border-top: solid;
     border-width: 1px;
diff --git a/client/assets/scss/main.scss b/client/assets/scss/main.scss
index 4075f8c..2d2e0ad 100644
--- a/client/assets/scss/main.scss
+++ b/client/assets/scss/main.scss
@@ -3,6 +3,7 @@ html {
     font-family: 'Roboto Slab', serif;
     max-width: 100%;
     overflow-x: hidden;
+    overflow-y: scroll;
 }
 body {
     max-width: 100%;
@@ -39,29 +40,20 @@ a {
         color: #3598db;
     }
 }
-code,
-pre {
-    white-space: pre-wrap;
-}
 hr {
     margin: 1em;
     border: 0;
     border-top: 1px solid #eee;
 }
-.Layout {
-    height: 100%;
+.Footer,
+.Main {
     display: flex;
-    flex-direction: column;
-    .Footer,
-    .Main {
-        display: flex;
-        padding-right: calc(50% - 997px / 2);
-        padding-left: calc(50% - 997px / 2);
-        &:after,
-        &:before {
-            content: " ";
-            width: 1em;
-        }
+    padding-right: calc(50% - 997px / 2);
+    padding-left: calc(50% - 997px / 2);
+    &:after,
+    &:before {
+        content: " ";
+        width: 1em;
     }
 }
 .Main {
diff --git a/client/js/pages/Index.js b/client/js/pages/Index.js
index bb64f30..5f54e1a 100644
--- a/client/js/pages/Index.js
+++ b/client/js/pages/Index.js
@@ -34,7 +34,7 @@ export default class Index extends React.Component {
 
     render() {
         return (
-          <div class="Layout" >
+          <div>
             <Header />
               <div class="Main">
                   {typeof this.page === 'undefined' ? <Preview posts={this.props.redux.preview.posts} /> : ""}
diff --git a/config.template.json b/config.template.json
index ea73a1e..7b6163b 100644
--- a/config.template.json
+++ b/config.template.json
@@ -1,7 +1,9 @@
 {
     "database": {
         "url": "",
-        "database": ""
+        "database": "",
+        "username": "",
+        "password": ""
     },
     "api": {
         "key": ""
diff --git a/package.json b/package.json
index 86a21bd..839bbc4 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "scripts": {
     "build": "webpack && babel-node metadata.js",
-    "c9": "webpack-dev-server --port $PORT --host $IP --hot --content-base public --history-api-fallback",
+    "c9": "webpack-dev-server --port $PORT --host $IP --hot --content-base dist --history-api-fallback",
     "dev": "webpack-dev-server --content-base public --inline --hot --history-api-fallback",
     "prod": "export NODE_ENV=production && webpack -p && babel-node metadata.js",
     "prod-win": "set NODE_ENV=production && webpack -p && babel-node metadata.js",
@@ -31,6 +31,7 @@
     "babel-plugin-react-html-attrs": "^2.0.0",
     "babel-plugin-transform-class-properties": "^6.11.5",
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
+    "babel-polyfill": "^6.13.0",
     "babel-preset-es2015": "^6.13.2",
     "babel-preset-react": "^6.11.1",
     "babel-preset-stage-0": "^6.5.0",
@@ -55,6 +56,7 @@
     "url-loader": "^0.5.7",
     "webpack": "^1.13.1",
     "webpack-dev-server": "^1.14.1",
+    "whatwg-fetch": "^1.0.0",
     "wowjs": "^1.1.3"
   }
 }
diff --git a/server/db/db.go b/server/db/db.go
index 57c162a..9759426 100644
--- a/server/db/db.go
+++ b/server/db/db.go
@@ -27,7 +27,15 @@ func Configure(d DatabaseInfo) {
 func (d *Driver) Connect() {
 	if (d.Info.URL != ""){
 		// Connect to MongoDB
-		s, err := mgo.DialWithTimeout(d.Info.URL, 5*time.Second)
+		database_info := &mgo.DialInfo{
+			Addrs: []string{d.Info.URL},
+			Database: d.Info.Database,
+			Timeout: 5*time.Second,
+			Username: d.Info.Username,
+			Password: d.Info.Password,
+		}
+		
+		s, err := mgo.DialWithInfo(database_info)
 	
 		if err != nil {
 			log.Println("MongoDB Driver Error", err)
diff --git a/webpack.config.js b/webpack.config.js
index 6201d9d..3b6726a 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -5,7 +5,7 @@ var HtmlWebpackPlugin = require('html-webpack-plugin');
 
 module.exports = {
   devtool: debug ? "inline-sourcemap" : null,
-  entry: "./client/js/app.js",
+  entry: ["babel-polyfill", , "whatwg-fetch", "./client/js/app.js"],
   module: {
     loaders: [
       {