diff --git a/Dockerfile b/Dockerfile
index 38ec879..1984223 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
-FROM node:10 AS builder
+FROM node:12-alpine AS builder
 # ENV NODE_ENV production
 COPY ./UI /src/UI
-RUN cd /src/UI && yarn && yarn build
+RUN cd /src/UI && npm ci && npm run build
 
 COPY ./Server /src/Server
-RUN cd /src/Server && yarn
+RUN cd /src/Server && npm ci
 
 RUN cp -r /src/UI/build /src/Server/public
 
 
-FROM mhart/alpine-node:10
+FROM node:12-alpine
 ENV NODE_ENV production
 WORKDIR /dist
 EXPOSE 6769
diff --git a/UI/src/actions/index.js b/UI/src/actions/index.js
index 6dff8cd..2c038a3 100644
--- a/UI/src/actions/index.js
+++ b/UI/src/actions/index.js
@@ -1,5 +1,5 @@
 import superagent from 'superagent'
-import { history } from './router/history'
+import { history } from '../router/history'
 
 export const fetchServers = async dispatch => {
   const rsp = await superagent.get('/api/servers')
diff --git a/UI/src/components/oauth-bot-flow/index.js b/UI/src/components/oauth-bot-flow/index.js
index 02714d4..e607304 100644
--- a/UI/src/components/oauth-bot-flow/index.js
+++ b/UI/src/components/oauth-bot-flow/index.js
@@ -5,7 +5,7 @@ import superagent from 'superagent'
 class OauthCallback extends Component {
   state = {
     notReady: true,
-    message: 'chotto matte kudasai...',
+    message: 'giving discord the good news...',
     url: null,
   }
 
@@ -28,4 +28,4 @@ class OauthCallback extends Component {
   }
 }
 
-export default connect(OauthCallback)
+export default connect()(OauthCallback)
diff --git a/UI/src/components/oauth-callback/index.js b/UI/src/components/oauth-callback/index.js
index 82251a9..469362f 100644
--- a/UI/src/components/oauth-callback/index.js
+++ b/UI/src/components/oauth-callback/index.js
@@ -7,7 +7,7 @@ import { fetchServers } from '../../actions'
 class OauthCallback extends Component {
   state = {
     notReady: true,
-    message: 'chotto matte kudasai...',
+    message: 'shaking hands with discord...',
     redirect: '/s',
   }
 
@@ -83,4 +83,4 @@ class OauthCallback extends Component {
   }
 }
 
-export default connect(OauthCallback)
+export default connect()(OauthCallback)
diff --git a/UI/src/components/oauth-flow/index.js b/UI/src/components/oauth-flow/index.js
index 38e3bae..7c24e0f 100644
--- a/UI/src/components/oauth-flow/index.js
+++ b/UI/src/components/oauth-flow/index.js
@@ -8,7 +8,7 @@ import { fetchServers } from '../../actions'
 class OauthCallback extends Component {
   state = {
     notReady: true,
-    message: 'chotto matte kudasai...',
+    message: 'sending you to discord...',
     redirect: '/s',
     url: null,
   }
@@ -82,4 +82,4 @@ class OauthCallback extends Component {
   }
 }
 
-export default connect(OauthCallback)
+export default connect()(OauthCallback)