diff --git a/client/src/App.jsx b/client/src/App.jsx
index dd700d14e..fd461f721 100644
--- a/client/src/App.jsx
+++ b/client/src/App.jsx
@@ -1,5 +1,5 @@
 import { lazy, Suspense } from 'react';
-import { Route } from 'react-router-dom';
+import { Route, Switch } from 'react-router-dom';
 import './App.css';
 import { QueryClient, QueryClientProvider } from 'react-query';
 import SocketProvider from './app/context/socketContext';
@@ -16,9 +16,7 @@ const PresenterSimple = lazy(() =>
 const StageManager = lazy(() =>
   import('./features/viewers/backstage/StageManager')
 );
-const Public = lazy(() =>
-  import('./features/viewers/foh/Public')
-);
+const Public = lazy(() => import('./features/viewers/foh/Public'));
 const Lower = lazy(() => import('./features/viewers/production/Lower'));
 const Pip = lazy(() => import('./features/viewers/production/Pip'));
 
@@ -42,15 +40,19 @@ function App() {
       <QueryClientProvider client={queryClient}>
         <div className='App'>
           <Suspense fallback={<div>Loading...</div>}>
-            <Route exact path='/' component={SSpeaker} />
-            <Route exact path='/sm' component={SStageManager} />
-            <Route exact path='/speaker' component={SSpeaker} />
-            <Route exact path='/speakersimple' component={SSpeakerSimple} />
-            <Route exact path='/editor' component={Editor} />
-            <Route path='/public' component={SPublic} />
-            <Route path='/lower' component={SLowerThird} />
-            {/* <ReactQueryDevtools initialIsOpen={false} /> */}
-            <Route path='/pip' component={SPip} />
+            <Switch>
+              <Route exact path='/' component={SSpeaker} />
+              <Route exact path='/sm' component={SStageManager} />
+              <Route exact path='/speaker' component={SSpeaker} />
+              <Route exact path='/speakersimple' component={SSpeakerSimple} />
+              <Route exact path='/editor' component={Editor} />
+              <Route exact path='/public' component={SPublic} />
+              <Route exact path='/lower' component={SLowerThird} />
+              <Route exact path='/pip' component={SPip} />
+              {/* Send to default if nothing found */}
+              <Route component={SSpeaker} />
+            </Switch>
+            <ReactQueryDevtools initialIsOpen={false} />
           </Suspense>
         </div>
       </QueryClientProvider>
diff --git a/client/src/app/context/eventContext.js b/client/src/app/context/eventContext.js
deleted file mode 100644
index e7cff3750..000000000
--- a/client/src/app/context/eventContext.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { createContext, useState } from 'react';
-
-export const EventContext = createContext([[], () => {}]);
-
-export function EventProvider(props) {
-  const [event, setEvent] = useState(null);
-
-  return (
-    <EventContext.Provider value={[event, setEvent]}>
-      {props.children}
-    </EventContext.Provider>
-  );
-}
diff --git a/client/src/app/context/eventListContext.js b/client/src/app/context/eventListContext.js
deleted file mode 100644
index f52cbe88d..000000000
--- a/client/src/app/context/eventListContext.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import { createContext, useState } from 'react';
-import { sampleData } from '../sampleData';
-
-export const EventListContext = createContext([[], () => {}]);
-
-export function EventListProvider(props) {
-  const [events, setEvents] = useState(sampleData.events);
-
-  return (
-    <EventListContext.Provider value={[events, setEvents]}>
-      {props.children}
-    </EventListContext.Provider>
-  );
-}
diff --git a/client/src/app/context/presenterMessageContext.js b/client/src/app/context/presenterMessageContext.js
deleted file mode 100644
index dba44b33e..000000000
--- a/client/src/app/context/presenterMessageContext.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { createContext, useState } from 'react';
-
-export const PresenterMessagesContext = createContext([[], () => {}]);
-
-export function PresenterMessageProvider(props) {
-  const [presMessage, setPresMessage] = useState({
-    text: '',
-    show: '',
-  });
-
-  return (
-    <PresenterMessagesContext.Provider value={[presMessage, setPresMessage]}>
-      {props.children}
-    </PresenterMessagesContext.Provider>
-  );
-}
diff --git a/client/src/common/components/myProgressBar/MyProgressBar.jsx b/client/src/common/components/myProgressBar/MyProgressBar.jsx
index df76f5108..6d70be2e4 100644
--- a/client/src/common/components/myProgressBar/MyProgressBar.jsx
+++ b/client/src/common/components/myProgressBar/MyProgressBar.jsx
@@ -4,8 +4,8 @@ import styles from './MyProgressBar.module.css';
 export default function MyProgressBar(props) {
   const { now, complete, showElapsed } = props;
   const percentComplete = showElapsed
-  ? clamp((100 - (now * 100) / complete - 1), 0, 100)
-  : clamp((now * 100) / complete - 1, 0, 100)
+  ? clamp((100 - (now * 100) / complete + 2), 0, 100)
+  : clamp((now * 100) / complete - 2, 0, 100)
 
 
   return (
diff --git a/client/src/common/components/views/Paginator.jsx b/client/src/common/components/views/Paginator.jsx
index f3f1e9cc0..2f9dc0a99 100644
--- a/client/src/common/components/views/Paginator.jsx
+++ b/client/src/common/components/views/Paginator.jsx
@@ -5,7 +5,7 @@ import { useInterval } from '../../../app/hooks/useInterval';
 
 export default function Paginator(props) {
   const { events, selectedId } = props;
-  const LIMIT_PER_PAGE = props.limit || 7;
+  const LIMIT_PER_PAGE = props.limit || 8;
   const SCROLL_TIME = (props.time * 1000) || 5000;
   const SCROLL_PAST = false;
   const [numEvents, setNumEvents] = useState(0);