diff --git a/Display/Dockerfile b/Display/Dockerfile
new file mode 100644
index 0000000..e32933e
--- /dev/null
+++ b/Display/Dockerfile
@@ -0,0 +1,25 @@
+### STAGE 1: Build ###
+
+FROM node:12.11.0-alpine as builder
+
+COPY package.json package-lock.json ./
+
+RUN npm ci && mkdir /ng-app && mv ./node_modules ./ng-app
+
+WORKDIR /ng-app
+
+COPY . .
+
+RUN npm run ng build -- --prod --output-path=dist
+
+### STAGE 2: Setup ###
+
+FROM nginx:1.17.4-alpine
+
+COPY nginx/default.conf /etc/nginx/conf.d/
+
+RUN rm -rf /usr/share/nginx/html/*
+
+COPY --from=builder /ng-app/dist /usr/share/nginx/html
+
+CMD ["nginx", "-g", "daemon off;"]
diff --git a/Display/nginx/default.conf b/Display/nginx/default.conf
new file mode 100644
index 0000000..f02102d
--- /dev/null
+++ b/Display/nginx/default.conf
@@ -0,0 +1,40 @@
+server {
+    listen 80;
+
+    sendfile on;
+
+    default_type application/octet-stream;
+
+    gzip on;
+    gzip_http_version 1.1;
+    gzip_disable      "MSIE [1-6]\.";
+    gzip_min_length   1100;
+    gzip_vary         on;
+    gzip_proxied      expired no-cache no-store private auth;
+    gzip_types        text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript;
+    gzip_comp_level   9;
+
+    root /usr/share/nginx/html;
+
+    location /api/weather/ {
+        proxy_pass http://172.23.10.3:80;
+    }
+
+    location /api/hub/ {
+        proxy_pass http://172.23.10.3:80;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "Upgrade";
+    }
+
+    location /socket.io {
+        proxy_pass http://172.23.10.30:80;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "Upgrade";
+    }
+
+    location / {
+        try_files $uri $uri/ /index.html =404;
+    }
+}
diff --git a/Display/src/app/components/weather/charts/weather-charts.component.ts b/Display/src/app/components/weather/charts/weather-charts.component.ts
index 46e4a74..6352177 100644
--- a/Display/src/app/components/weather/charts/weather-charts.component.ts
+++ b/Display/src/app/components/weather/charts/weather-charts.component.ts
@@ -24,9 +24,7 @@ enum TimeSpan {
 export class WeatherChartsComponent implements OnInit {
 
     public chart: Chart;
-
-    private loading = true;
-
+    public loading = true;
     public timeSpanItems: { [value: number]: string } = {};
     public timeSpans: typeof TimeSpan = TimeSpan;
     public maxDate: moment.Moment = moment().endOf('day');