diff --git a/Dockerfile b/Dockerfile
index 01d3072..90fb674 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,36 +1,36 @@
 FROM node:alpine
 
 RUN mkdir -p /opt/frontend
 WORKDIR /opt/frontend
 
 ADD package.json /opt/frontend
 RUN yarn
 
-ARG PUBLIC_PWA_GATEWAY_URI
-ENV PUBLIC_PWA_GATEWAY_URI=${PUBLIC_PWA_GATEWAY_URI}
-ARG PUBLIC_KEYCLOAK_URI
-ENV PUBLIC_KEYCLOAK_URI=${PUBLIC_KEYCLOAK_URI}
-ARG KEYCLOAK_AUTH_REALM
-ENV KEYCLOAK_AUTH_REALM=${KEYCLOAK_AUTH_REALM}
-ARG KEYCLOAK_FRONTEND_CLIENT_ID
-ENV KEYCLOAK_FRONTEND_CLIENT_ID=${KEYCLOAK_FRONTEND_CLIENT_ID}
-
-ARG PWA_GATEWAY_URI
-ENV PWA_GATEWAY_URI=${PWA_GATEWAY_URI}
-ARG KEYCLOAK_URI
-ENV KEYCLOAK_URI=${KEYCLOAK_URI}
+#ARG PUBLIC_PWA_GATEWAY_URI
+#ENV PUBLIC_PWA_GATEWAY_URI=${PUBLIC_PWA_GATEWAY_URI}
+#ARG PUBLIC_KEYCLOAK_URI
+#ENV PUBLIC_KEYCLOAK_URI=${PUBLIC_KEYCLOAK_URI}
+#ARG KEYCLOAK_AUTH_REALM
+#ENV KEYCLOAK_AUTH_REALM=${KEYCLOAK_AUTH_REALM}
+#ARG KEYCLOAK_FRONTEND_CLIENT_ID
+#ENV KEYCLOAK_FRONTEND_CLIENT_ID=${KEYCLOAK_FRONTEND_CLIENT_ID}
+
+#ARG PWA_GATEWAY_URI
+#ENV PWA_GATEWAY_URI=${PWA_GATEWAY_URI}
+#ARG KEYCLOAK_URI
+#ENV KEYCLOAK_URI=${KEYCLOAK_URI}
 
 ARG SERVICE_PORT
 ENV SERVICE_PORT=${SERVICE_PORT}
 
 ARG BUILD_LANGUAGE
 ENV BUILD_LANGUAGE=${BUILD_LANGUAGE}
 
 ENV RUNNING_ENV="docker"
 
 ADD . .
-RUN yarn run build
+#RUN yarn run build
 
 EXPOSE ${SERVICE_PORT}
 
-CMD ["npm", "run", "start"]
+CMD ["npm", "run", "build-and-start"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 69e9c79..c65ab64 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,18 +1,18 @@
 version: "3.4"
 services:
   frontend:
     build:
       context: ./
       args:
         SERVICE_PORT: ${SERVICE_PORT}
-        PUBLIC_PWA_GATEWAY_URI: ${PUBLIC_PWA_GATEWAY_URI}
-        PUBLIC_KEYCLOAK_URI: ${PUBLIC_KEYCLOAK_URI}
-        KEYCLOAK_AUTH_REALM: ${KEYCLOAK_AUTH_REALM}
-        KEYCLOAK_FRONTEND_CLIENT_ID: ${KEYCLOAK_FRONTEND_CLIENT_ID}
-        PWA_GATEWAY_URI: ${PWA_GATEWAY_URI}
-        KEYCLOAK_URI: ${KEYCLOAK_URI}
         BUILD_LANGUAGE: ${PWA_BUILD_LANGUAGE}
     image: "${DOCKER_REGISTRY}wikitolearn/frontend-${PWA_BUILD_LANGUAGE}"
+    environment:
+      PUBLIC_PWA_GATEWAY_URI: ${PUBLIC_PWA_GATEWAY_URI}
+      PUBLIC_KEYCLOAK_URI: ${PUBLIC_KEYCLOAK_URI}
+      KEYCLOAK_AUTH_REALM: ${KEYCLOAK_AUTH_REALM}
+      KEYCLOAK_FRONTEND_CLIENT_ID: ${KEYCLOAK_FRONTEND_CLIENT_ID}
+      PWA_GATEWAY_URI: ${PWA_GATEWAY_URI}
+      KEYCLOAK_URI: ${KEYCLOAK_URI}
     ports:
       - "${SERVICE_PORT}:${SERVICE_PORT}"
-
diff --git a/package.json b/package.json
index d9ecfe1..41c0422 100644
--- a/package.json
+++ b/package.json
@@ -1,108 +1,109 @@
 {
   "name": "vue-webpack-ssr-fully-featured",
   "version": "0.0.5",
   "description": "",
   "author": "Cristian Baldi",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
     "dev": "node server",
     "start": "cross-env NODE_ENV=production node server",
     "build": "rimraf dist && npm run build:client && npm run build:server",
     "build:client": "cross-env NODE_ENV=production webpack --config build/webpack.client.config.js --progress --hide-modules",
-    "build:server": "cross-env NODE_ENV=production webpack --config build/webpack.server.config.js --progress --hide-modules",
+		"build:server": "cross-env NODE_ENV=production webpack --config build/webpack.server.config.js --progress --hide-modules",
+		"build-and-start": "npm run build && npm run start",
     "test": "npm run test:unit && npm run test:e2e",
     "test:e2e": "rimraf test/e2e/reports && cross-env NODE_ENV=testing node test/e2e/runner.js",
     "test:unit": "rimraf test/unit/coverage && cross-env NODE_ENV=testing karma start test/unit/karma.conf.js "
   },
   "engines": {
     "node": ">=7.0",
     "npm": ">=4.0"
   },
   "devDependencies": {
     "autoprefixer": "^8.5.0",
     "avoriaz": "^6.3.0",
     "babel-core": "^6.26.3",
     "babel-eslint": "8",
     "babel-loader": "^7.1.4",
     "babel-plugin-dynamic-import-node": "^1.2.0",
     "babel-plugin-dynamic-import-webpack": "^1.0.2",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "babel-polyfill": "^6.26.0",
     "babel-preset-env": "^1.7.0",
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-stage-2": "^6.24.1",
     "babili-webpack-plugin": "^0.1.2",
     "chai": "^4.1.0",
     "chromedriver": "^2.38.3",
     "cross-env": "^5.1.5",
     "cross-spawn": "^6.0.5",
     "css-loader": "^0.28.11",
     "cssnano": "^3.10.0",
     "eslint": "^4.19.1",
     "eslint-config-google": "^0.9.1",
     "eslint-loader": "^2.0.0",
     "eslint-plugin-html": "^4.0.3",
     "file-loader": "^1.1.11",
     "friendly-errors-webpack-plugin": "^1.7.0",
     "html-webpack-harddisk-plugin": "^0.2.0",
     "html-webpack-plugin": "^3.1.0",
     "inject-loader": "^4.0.1",
     "karma": "^2.0.2",
     "karma-coverage": "^1.1.2",
     "karma-mocha": "^1.3.0",
     "karma-phantomjs-launcher": "^1.0.4",
     "karma-sinon-chai": "^1.3.4",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "^0.0.32",
     "karma-webpack": "^3.0.0",
     "lolex": "^2.5.0",
     "memory-fs": "^0.4.1",
     "mocha": "^5.1.1",
     "nightwatch": "^0.9.21",
     "node-polyglot": "^2.2.2",
     "node-sass": "^4.9.0",
     "phantomjs-prebuilt": "^2.1.16",
     "postcss-loader": "^2.1.5",
     "pug": "^2.0.3",
     "rimraf": "^2.6.2",
     "sass-loader": "^7.0.1",
     "selenium-server": "^3.12.0",
     "sinon": "^5.0.7",
     "sinon-chai": "^3.0.0",
     "string-replace-webpack-plugin": "^0.1.3",
     "stylelint": "^9.2.0",
     "stylelint-config-standard": "^18.2.0",
     "stylelint-processor-html": "^1.0.0",
     "stylelint-scss": "^3.1.0",
     "stylelint-webpack-plugin": "^0.10.4",
     "sw-precache-webpack-plugin": "^0.11.5",
     "url-loader": "^0.6.2",
     "vue-loader": "^14.2.2",
     "vue-template-compiler": "^2.5.16",
     "webpack": "^4.8.3",
     "webpack-cli": "^2.1.3",
     "webpack-dev-middleware": "^3.1.3",
     "webpack-hot-middleware": "^2.22.2",
     "webpack-merge": "^4.1.2"
   },
   "dependencies": {
     "@websanova/vue-auth": "^2.15.1-beta",
     "axios": "^0.18.0",
     "compression": "^1.7.2",
     "es6-promise": "^4.2.4",
     "express": "^4.16.3",
     "lru-cache": "^4.1.3",
     "require-env": "^0.2.1",
     "serve-favicon": "^2.4.3",
     "vue": "^2.5.16",
     "vue-axios": "^2.1.1",
     "vue-i18n": "^7.6.0",
     "vue-keycloak": "0.0.11",
     "vue-no-ssr": "^0.2.2",
     "vue-router": "^3.0.1",
     "vue-server-renderer": "^2.5.16",
     "vuex": "^3.0.1",
     "vuex-router-sync": "^5.0.0"
   }
 }
diff --git a/src/components/ChapterPages.vue b/src/components/ChapterPages.vue
index c9c9908..eccfc9d 100644
--- a/src/components/ChapterPages.vue
+++ b/src/components/ChapterPages.vue
@@ -1,43 +1,44 @@
 <template lang="pug">
 	.ChapterPages
 		h3.ChapterPages__title {{ number }}. {{ chapter.title }}
 		ul
 			li(
 				v-for="page in chapter.pages"
 				:key="page._id"
 			)
 				router-link(:to=`{
 					name: "Page",
 					append: true,
 					params: {
 						pageTitle: page._id
 					}
 				}`) {{ page.title }}
 </template>
 
 <script>
 export default {
 	name: "ChapterPages",
 	props: {
 		chapter: {
 			type: Object,
 			required: true
 		},
 		number: {
 			type: Number,
 			required: true
 		}
 	}
 }
 </script>
 
 <style lang="scss">
 @import "~styles/_variables";
+
 .ChapterPages {
 	margin-bottom: 1rem;
 
 	&__title {
 		border-bottom: 1px solid $lightgray;
 	}
 }
 </style>
diff --git a/src/components/CourseRenderer.vue b/src/components/CourseRenderer.vue
index 027c374..4e68b9a 100644
--- a/src/components/CourseRenderer.vue
+++ b/src/components/CourseRenderer.vue
@@ -1,78 +1,78 @@
 <template lang="pug">
 	.CourseRenderer
 		h3.CourseRenderer__name(v-if="showName") {{ course.name }}
 		ul.CourseRenderer__chapters
 			li.CourseRenderer__chapter(
 				v-for="(chapter, index) in course.chapters"
 				:key="chapter._id"
 			)
 				ChapterPages(
 					:chapter="chapter"
 					:number="index + 1"
 				)
 			//
 				router-link(:to=`{
 					name: "Chapter",
 					append: true,
 					params: {
 						chapterName: chapter._id
 					}
 				}`) {{ chapter.title }}
 </template>
 
 <style lang="scss">
 @import "~styles/declarations";
 
 .CourseRenderer {
 	padding: 2rem;
 
 	&__description {
 		font-style: italic;
 		margin-bottom: 2rem;
 		padding: 1rem;
 		background-color: whitesmoke;
 		border: 1px solid gray;
 	}
 
 	&__chapters {
 		display: flex;
 		flex-wrap: wrap;
 	}
 
 	&__chapter {
 		flex: 0 0 95%;
 	}
 
 	@include media-breakpoint-up(md) {
 		&__chapter {
-			margin: 0 .5rem .5rem .5rem;
+			margin: 0 0.5rem 0.5rem 0.5rem;
 			flex: 0 0 42%;
 		}
 	}
 
 	@include media-breakpoint-up(xl) {
 		&__chapter {
 			flex: 0 0 30%;
 		}
 	}
 }
 </style>
 
 <script>
 import ChapterPages from "components/ChapterPages"
 
 export default {
 	name: "CourseRenderer",
 	components: { ChapterPages },
 	props: {
 		course: {
 			type: Object,
 			required: true
 		},
 		showName: {
 			type: Boolean,
 			default: true
 		}
 	}
 }
 </script>