diff --git a/.gitignore b/.gitignore
index bec48db07..0ce2f2026 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,7 @@ node_modules/
 /coverage
 
 # production
-/build
+build/
 
 # misc
 .DS_Store
diff --git a/client/package.json b/client/package.json
index dfd60e6fc..90db39014 100644
--- a/client/package.json
+++ b/client/package.json
@@ -47,5 +47,6 @@
       "last 1 firefox version",
       "last 1 safari version"
     ]
-  }
+  },
+  "devDependencies": {}
 }
diff --git a/client/src/common/components/buttons/SettingsIconBtn.jsx b/client/src/common/components/buttons/SettingsIconBtn.jsx
index 2fd8e538d..8a4e3b65f 100644
--- a/client/src/common/components/buttons/SettingsIconBtn.jsx
+++ b/client/src/common/components/buttons/SettingsIconBtn.jsx
@@ -11,6 +11,7 @@ export default function SettingsIconBtn(props) {
       variant='outline'
       onClick={clickhandler}
       _focus={{ boxShadow: 'none' }}
+      colorScheme='whiteAlpha'
       {...rest}
     />
   );
diff --git a/client/src/features/viewers/DefaultPresenter.jsx b/client/src/features/viewers/DefaultPresenter.jsx
deleted file mode 100644
index d41c44176..000000000
--- a/client/src/features/viewers/DefaultPresenter.jsx
+++ /dev/null
@@ -1,130 +0,0 @@
-import { useEffect, useState } from 'react';
-import { useSocket } from '../../app/context/socketContext';
-import style from './DefaultPresenter.module.css';
-
-export default function DefaultPresenter() {
-  const socket = useSocket();
-  const [pres, setPres] = useState({
-    text: '',
-    visible: false,
-  });
-  const [publ, setPubl] = useState({
-    text: '',
-    visible: false,
-  });
-  const [lower, setLower] = useState({
-    text: '',
-    visible: false,
-  });
-  const [timer, setTimer] = useState({
-    clock: null,
-    currentSeconds: null,
-    startedAt: null,
-    expectedFinish: null,
-  });
-  const [titles, setTitles] = useState({
-    titleNow: '',
-    subtitleNow: '',
-    presenterNow: '',
-    titleNext: '',
-    subtitleNext: '',
-    presenterNext: '',
-  });
-
-  // Ask for update on load
-  useEffect(() => {
-    if (socket == null) return;
-
-    // Handle presenter messages
-    socket.on('messages-presenter', (data) => {
-      setPres({ ...data });
-    });
-
-    // Handle public messages
-    socket.on('messages-public', (data) => {
-      setPubl({ ...data });
-    });
-
-    // Handle lower third messages
-    socket.on('messages-lower', (data) => {
-      setLower({ ...data });
-    });
-
-    // Handle timer
-    socket.on('timer', (data) => {
-      setTimer({ ...data });
-    });
-
-    // Handle timer
-    socket.on('titles', (data) => {
-      setTitles({ ...data });
-    });
-
-    // Ask for up to date data
-    socket.emit('get-messages');
-
-    // Ask for up to data
-    socket.emit('get-presenter');
-
-    // Ask for up titles
-    socket.emit('get-titles');
-
-    // Clear listeners
-    return () => {
-      socket.off('messages-public');
-      socket.off('messages-presenter');
-      socket.off('messages-lower');
-      socket.off('timer');
-      socket.off('titles');
-    };
-  }, [socket]);
-
-  return (
-    <div className={style.mainContainer}>
-      <div className={style.container}>
-        <span className={style.label}>Clock: </span>
-        <span>{timer.clock}</span>
-        <span className={style.label}>Timer: </span>
-        <span>{timer.currentSeconds}</span>
-        <span className={style.label}>Started: </span>
-        <span>{timer.startedAt}</span>
-        <span className={style.label}>Finish: </span>
-        <span>{timer.expectedFinish}</span>
-      </div>
-      <div className={style.container}>
-        <span className={style.label}>Presenter Message: </span>
-        <span>{pres.text}</span>
-        <span className={style.label}>Vis: </span>
-        <span>{pres.visible ? 'visible' : 'invisible'}</span>
-      </div>
-      <div className={style.container}>
-        <span className={style.label}>Public Message: </span>
-        <span>{publ.text}</span>
-        <span className={style.label}>Vis: </span>
-        <span>{publ.visible ? 'visible' : 'invisible'}</span>
-      </div>
-      <div className={style.container}>
-        <span className={style.label}>Lower third Message: </span>
-        <span>{lower.text}</span>
-        <span className={style.label}>Vis: </span>
-        <span>{lower.visible ? 'visible' : 'invisible'}</span>
-      </div>
-      <div className={style.container}>
-        <span className={style.label}>Title Now: </span>
-        <span>{titles.titleNow}</span>
-        <span className={style.label}>Subtitle Now: </span>
-        <span>{titles.subtitleNow}</span>
-        <span className={style.label}>Presenter Now: </span>
-        <span>{titles.presenterNow}</span>
-      </div>
-      <div className={style.container}>
-        <span className={style.label}>Title Next: </span>
-        <span>{titles.titleNext}</span>
-        <span className={style.label}>Subtitle Next: </span>
-        <span>{titles.subtitleNext}</span>
-        <span className={style.label}>Presenter Next: </span>
-        <span>{titles.presenterNext}</span>
-      </div>
-    </div>
-  );
-}
diff --git a/client/src/features/viewers/DefaultPresenter.module.css b/client/src/features/viewers/DefaultPresenter.module.css
deleted file mode 100644
index 1f35c8eda..000000000
--- a/client/src/features/viewers/DefaultPresenter.module.css
+++ /dev/null
@@ -1,18 +0,0 @@
-.mainContainer {
-  color: white;
-  display: flex;
-  flex-direction: rows;
-  flex-wrap: wrap;
-  font-size: 28px;
-  gap: 2em
-}
-
-.container {
-  flex: 1 0 56%;
-  display: flex;
-}
-
-.label {
-  padding: 0 1em;
-  color: #fff5;
-}
diff --git a/server/classes/Timer.js b/server/classes/Timer.js
index ea0e25d38..d228d725c 100644
--- a/server/classes/Timer.js
+++ b/server/classes/Timer.js
@@ -72,6 +72,7 @@ class Timer {
 
   // helpers
   static toSeconds(millis) {
+    if (millis == null) return null;
     return Math.floor(Math.max(millis * 0.001), 0);
   }
 
diff --git a/yarn.lock b/yarn.lock
deleted file mode 100644
index fb57ccd13..000000000
--- a/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-