diff --git a/WebServer/index.html b/WebServer/index.html
index 4ef127a80..5dff45d57 100644
--- a/WebServer/index.html
+++ b/WebServer/index.html
@@ -13,7 +13,7 @@
     <script type="text/javascript">
         function loadCanvas() {
             window.canvasApp = {
-                urlPrefix: 'http://localhost:WEB_SERVER_PORT/'
+                urlPrefix: ''
             };
 
             try {
diff --git a/WebServer/main.css b/WebServer/main.css
index ade4c347a..9c38d04a2 100644
--- a/WebServer/main.css
+++ b/WebServer/main.css
@@ -3,7 +3,7 @@
   font-family: 'Saira';
   font-style: normal;
   font-weight: 300;
-  src: local('Saira Light'), local('Saira-Light'), url(http://localhost:WEB_SERVER_PORT/Fonts/Saira.woff2) format('woff2');
+  src: local('Saira Light'), local('Saira-Light'), url(Fonts/Saira.woff2) format('woff2');
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 /* latin */
@@ -11,6 +11,6 @@
   font-family: 'Saira Condensed';
   font-style: normal;
   font-weight: 300;
-  src: local('Saira Condensed Light'), local('SairaCondensed-Light'), url(http://localhost:WEB_SERVER_PORT/Fonts/Saira-Condensed.woff2) format('woff2');
+  src: local('Saira Condensed Light'), local('SairaCondensed-Light'), url(Fonts/Saira-Condensed.woff2) format('woff2');
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
\ No newline at end of file
diff --git a/webServer.js b/webServer.js
index 48e892c87..8b594f4b9 100644
--- a/webServer.js
+++ b/webServer.js
@@ -43,7 +43,14 @@ exports.newWebServer = function newWebServer(EVENTS_SERVER) {
             if (isHttpServerStarted === false) {
                 gWebServer = http.createServer(onBrowserRequest).listen(port)
                 isHttpServerStarted = true
-                open('http://localhost:' + port)
+
+                /* Starting the browser now is optional */
+                if (process.argv[4] !== 'noBrowser') {
+                    open('http://localhost:' + port)
+                } else {
+                    console.log('Running Backend only with no UI.')
+                }
+
                 console.log('Web Server Started.')
             }
         } catch (err) {