diff --git a/src/App.scss b/src/App.scss
index 48bc3de..d55ffa6 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -17,6 +17,9 @@ $number-of-channels: 3;
     .logo {
       height: 50px;
     }
+    .logo-big {
+      height: 30vh;
+    }
   }
   .inner {
     text-align: center;
diff --git a/src/assets/images/presenterlogo.png b/src/assets/images/presenterlogo.png
new file mode 100644
index 0000000..4a97811
Binary files /dev/null and b/src/assets/images/presenterlogo.png differ
diff --git a/src/assets/images/bapsicle.png b/src/assets/images/serverlogo.png
similarity index 100%
rename from src/assets/images/bapsicle.png
rename to src/assets/images/serverlogo.png
diff --git a/src/bapiclesession/index.tsx b/src/bapiclesession/index.tsx
index 1f91844..cb1074b 100644
--- a/src/bapiclesession/index.tsx
+++ b/src/bapiclesession/index.tsx
@@ -5,14 +5,14 @@ import { useSelector, useDispatch } from "react-redux";
 import { RootState } from "../rootReducer";
 import Showplanner from "../showplanner";
 
-import BAPSicleLogo from "../assets/images/bapsicle.png";
-import appLogo from "../assets/images/bapsicle.png";
+import serverLogo from "../assets/images/serverlogo.png";
+import appLogo from "../assets/images/presenterlogo.png";
 
 export function ConnectionDialogue({ error }: { error: String | null }) {
   return (
     <div className="loading-dialogue">
       <div className="logo-container">
-        <img className="logo mb-5" src={appLogo} alt="BAPS Logo" />
+        <img className="logo-big mb-2" src={appLogo} alt="BAPS Logo" />
       </div>
 
       <span className="inner">
@@ -21,37 +21,25 @@ export function ConnectionDialogue({ error }: { error: String | null }) {
           <strong>Broadcast &amp; Presenting Suite</strong>
         </p>
         <hr />
-        {error !== null && (
-          <>
-            <span>
-              <strong>Failed!</strong> <code>{error}</code>
-            </span>
-            <form>
-              <div>
-                <label htmlFor="hostname">Hostname: </label>
-                <input
-                  name="hostname"
-                  type="text"
-                  placeholder="localhost"
-                ></input>
-              </div>
-              <div>
-                <label htmlFor="port">Port: </label>
-                <input name="port" type="text" placeholder="13501"></input>
-              </div>
-              <div>
-                <input type="submit" value="Connect" />
-              </div>
-            </form>
-            <hr />
-          </>
-        )}
-        {error == null && <p>Connecting...</p>}
+        <span className="my-2">
+          {error == null && <strong>Connecting...</strong>}
+          {error != null && (
+            <>
+              <strong>Disconnected!</strong> <code>{error}</code>
+            </>
+          )}
+        </span>
+        <form className="my-3">
+          <input className="btn btn-primary" type="submit" value="Reconnect" />
+        </form>
       </span>
       <hr />
       <div className="logo-container">
         Powered by
-        <img className="logo mb-5" src={BAPSicleLogo} alt="BAPSicle Logo" />
+        <br />
+        <a href={"http://" + window.location.hostname + ":13500"}>
+          <img className="logo mb-5" src={serverLogo} alt="BAPSicle" />
+        </a>
       </div>
     </div>
   );
diff --git a/src/bapiclesession/state.ts b/src/bapiclesession/state.ts
index c98655f..5936141 100644
--- a/src/bapiclesession/state.ts
+++ b/src/bapiclesession/state.ts
@@ -70,12 +70,12 @@ export const getCurrentServer = (): AppThunk => async (dispatch, getState) => {
 export const getServer = (): AppThunk => async (dispatch) => {
   // TODO Server Details Configurable
   let bapsServer: bapsServer = {
-    hostname: "webstudio-dev.ury.org.uk",
+    hostname: window.location.hostname,
     port: 13501,
     name: "Connecting...",
   };
   dispatch(sessionState.actions.setCurrentServer({ server: bapsServer }));
-  dispatch(connectBAPSicle("ws://webstudio-dev.ury.org.uk:13501"));
+  dispatch(connectBAPSicle("ws://" + window.location.hostname + ":13501"));
   /*
   dispatch(sessionState.actions.getUserStarting());
   try {
diff --git a/src/bapsicle.ts b/src/bapsicle.ts
index 5e86e93..d3f6a78 100644
--- a/src/bapsicle.ts
+++ b/src/bapsicle.ts
@@ -161,6 +161,7 @@ export const connectBAPSicle = (path: string): AppThunk => async (
   dispatch(SessionState.setServerState("CONNECTING"));
   BAPSicleWS.onopen = () => dispatch(SessionState.setServerState("CONNECTED"));
   BAPSicleWS.onclose = () => dispatch(SessionState.setServerState("FAILED"));
+  BAPSicleWS.onerror = () => dispatch(SessionState.setServerState("FAILED"));
 };
 
 export const disconnectBAPSicle = () => {