diff --git a/tank-frontend/src/App.css b/tank-frontend/src/App.css
new file mode 100644
index 0000000..8845dee
--- /dev/null
+++ b/tank-frontend/src/App.css
@@ -0,0 +1,4 @@
+.GadgetRows {
+    justify-content: space-evenly;
+    margin-top: 24px;
+}
diff --git a/tank-frontend/src/App.tsx b/tank-frontend/src/App.tsx
new file mode 100644
index 0000000..312d5c6
--- /dev/null
+++ b/tank-frontend/src/App.tsx
@@ -0,0 +1,47 @@
+import {useCallback, useState} from 'react';
+import ClientScreen from './ClientScreen';
+import Controls from './Controls.tsx';
+import JoinForm from './JoinForm.tsx';
+import PlayerInfo from './PlayerInfo.tsx';
+import {useStoredObjectState} from './useStoredState.ts';
+import {NameId, postPlayer} from './serverCalls.tsx';
+import Column from "./components/Column.tsx";
+import Row from "./components/Row.tsx";
+import Scoreboard from "./Scoreboard.tsx";
+import Button from "./components/Button.tsx";
+import './App.css';
+
+const getNewNameId = () => ({
+    id: crypto.randomUUID(),
+    name: ''
+});
+
+export default function App() {
+    const [nameId, setNameId] = useStoredObjectState<NameId>('access', getNewNameId);
+
+    const [isLoggedIn, setLoggedIn] = useState<boolean>(false);
+    const logout = () => setLoggedIn(false);
+
+    useCallback(async () => {
+        if (isLoggedIn)
+            return;
+        const result = await postPlayer(nameId);
+        setLoggedIn(result !== null);
+    }, [nameId, isLoggedIn])();
+
+    return <Column className='grow'>
+        <Row>
+            <h1 className='grow'>Tanks!</h1>
+            {nameId.name !== '' &&
+                <Button className='PlayerInfo-Reset' onClick={() => setNameId(getNewNameId)} text='logout'/>}
+        </Row>
+        <ClientScreen logout={logout}/>
+        {nameId.name === '' && <JoinForm setNameId={setNameId} clientId={nameId.id}/>}
+        {isLoggedIn && <Row className='GadgetRows'>
+            <Controls playerId={nameId.id} logout={logout}/>
+            <PlayerInfo playerId={nameId.id} logout={logout}/>
+            <Scoreboard/>
+        </Row>
+        }
+    </Column>;
+}
diff --git a/tank-frontend/src/Controls.css b/tank-frontend/src/Controls.css
index 6946ffc..bff9ee5 100644
--- a/tank-frontend/src/Controls.css
+++ b/tank-frontend/src/Controls.css
@@ -6,7 +6,7 @@ kbd {
     background: hsl(0, 0%, 96%);
     padding: 10px;
     display: block;
-    border-radius: 5px;
+
     margin: 5px;
     width: 1.6em;
     height: 1.3em;
diff --git a/tank-frontend/src/Controls.tsx b/tank-frontend/src/Controls.tsx
index dfaed5d..24c55cc 100644
--- a/tank-frontend/src/Controls.tsx
+++ b/tank-frontend/src/Controls.tsx
@@ -62,12 +62,12 @@ export default function Controls({playerId, logout}: {
     return <Column className="Controls">
         <div className="control">
             <div className="row">
-                <kbd className="up">↑</kbd>
+                <kbd className="up">▲</kbd>
             </div>
             <div className="row">
-                <kbd>←</kbd>
-                <kbd>↓</kbd>
-                <kbd>→</kbd>
+                <kbd>◄</kbd>
+                <kbd>▼</kbd>
+                <kbd>►</kbd>
             </div>
         </div>
         <h3>Move</h3>
diff --git a/tank-frontend/src/JoinForm.css b/tank-frontend/src/JoinForm.css
index 2285355..9ffd703 100644
--- a/tank-frontend/src/JoinForm.css
+++ b/tank-frontend/src/JoinForm.css
@@ -1,9 +1,13 @@
 .JoinForm {
-    border: 2px solid rgb(76, 76, 76);
-    border-radius: 4px;
-}
+    border: 4px solid rgb(76, 76, 76);
 
-.JoinElems {
-    padding: 8px 8px;
-    margin: 8px 8px;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+
+    background: black;
+
+    gap: 16px;
+    padding: 16px;
 }
diff --git a/tank-frontend/src/JoinForm.tsx b/tank-frontend/src/JoinForm.tsx
index 2d0180e..e10cddd 100644
--- a/tank-frontend/src/JoinForm.tsx
+++ b/tank-frontend/src/JoinForm.tsx
@@ -3,6 +3,8 @@ import './JoinForm.css';
 import {NameId, PlayerResponse, postPlayer} from './serverCalls';
 import {Guid} from './Guid.ts';
 import Column from "./components/Column.tsx";
+import Button from "./components/Button.tsx";
+import TextInput from "./components/TextInput.tsx";
 
 export default function JoinForm({setNameId, clientId}: {
     setNameId: (mutator: (oldState: NameId) => NameId) => void,
@@ -31,25 +33,19 @@ export default function JoinForm({setNameId, clientId}: {
     }, [clicked, setData, data, clientId, setClicked, setNameId]);
 
     const disableButtons = clicked || name.trim() === '';
+    const setClickedTrue = () => setClicked(true);
+
     return <Column className='JoinForm'>
-        <p className="JoinElems"> Enter your name to join the game! </p>
-        <input
-            className="JoinElems"
-            type="text"
+        <h3> Enter your name to play </h3>
+        <TextInput
             value={name}
             placeholder="player name"
             onChange={e => setName(e.target.value)}
-            onKeyUp={event => {
-                if (event.key === 'Enter')
-                    setClicked(true);
-            }}
+            onEnter={setClickedTrue}
         />
-        <button
-            className="JoinElems"
-            onClick={() => setClicked(true)}
+        <Button
+            onClick={setClickedTrue}
             disabled={disableButtons}
-        >
-            join
-        </button>
+            text='INSERT COIN'/>
     </Column>;
 }
diff --git a/tank-frontend/src/PlayerInfo.css b/tank-frontend/src/PlayerInfo.css
index c3a8623..14ae318 100644
--- a/tank-frontend/src/PlayerInfo.css
+++ b/tank-frontend/src/PlayerInfo.css
@@ -1,9 +1,5 @@
-    .Elems {
+.Elems {
     padding: 8px 8px;
     margin: 8px 8px;
 }
 
-.PlayerInfo-Reset {
-    height: 4em;
-    width: 4em;
-}
diff --git a/tank-frontend/src/components/Button.css b/tank-frontend/src/components/Button.css
index 8efe497..b0b9c76 100644
--- a/tank-frontend/src/components/Button.css
+++ b/tank-frontend/src/components/Button.css
@@ -1,7 +1,14 @@
 .Button {
-    border: solid 1px green;
-    border-radius: 12px;
+    border: solid 4px green;
+    padding: 8px;
 
     color: green;
     background: transparent;
 }
+
+.Button:hover, .Button:active {
+    background-color: green;
+    color: black;
+    cursor: pointer;
+}
+
diff --git a/tank-frontend/src/components/Button.tsx b/tank-frontend/src/components/Button.tsx
index c3be029..609245c 100644
--- a/tank-frontend/src/components/Button.tsx
+++ b/tank-frontend/src/components/Button.tsx
@@ -1,14 +1,16 @@
 import './Button.css';
 import {MouseEventHandler} from "react";
 
-export default function Button({text, onClick, className}: {
+export default function Button({text, onClick, className, disabled}: {
     text: string,
     onClick?: MouseEventHandler<HTMLButtonElement>,
-    className?: string
+    className?: string,
+    disabled?: boolean
 }) {
     return <button
         className={'Button ' + (className ?? '')}
         onClick={onClick}
+        disabled={disabled ?? false}
     >
         {text}
     </button>
diff --git a/tank-frontend/src/components/TextInput.css b/tank-frontend/src/components/TextInput.css
new file mode 100644
index 0000000..06e873a
--- /dev/null
+++ b/tank-frontend/src/components/TextInput.css
@@ -0,0 +1,3 @@
+.TextInput {
+    padding: 8px;
+}
diff --git a/tank-frontend/src/components/TextInput.tsx b/tank-frontend/src/components/TextInput.tsx
new file mode 100644
index 0000000..b806045
--- /dev/null
+++ b/tank-frontend/src/components/TextInput.tsx
@@ -0,0 +1,21 @@
+import {ChangeEventHandler} from "react";
+import './TextInput.css';
+
+export default function TextInput(props: {
+    onChange?: ChangeEventHandler<HTMLInputElement> | undefined;
+    className?: string;
+    value: string;
+    placeholder: string;
+    onEnter?: () => void;
+}) {
+    return <input
+        {...props}
+        type="text"
+        className={'TextInput ' + (props.className?? '')}
+
+        onKeyUp={event => {
+            if (props.onEnter && event.key === 'Enter')
+                props.onEnter();
+        }}
+    />;
+}
diff --git a/tank-frontend/src/index.css b/tank-frontend/src/index.css
index dcd795f..b60815d 100644
--- a/tank-frontend/src/index.css
+++ b/tank-frontend/src/index.css
@@ -1,7 +1,3 @@
-* {
-    box-sizing: border-box;
-}
-
 @font-face {
     font-family: 'CCCBFont';
     font-style: normal;
@@ -10,10 +6,15 @@
     src: url('/CCCBFont.ttf') format('ttf'), url('/CCCBFont.woff') format('woff');
 }
 
+* {
+    box-sizing: border-box;
+    font-family: CCCBFont, monospace;
+    text-transform: uppercase;
+}
+
 html, body {
     height: 100%;
 
-    font-family: CCCBFont, monospace;
     margin: 0;
     display: flex;
     align-items: center;
@@ -34,8 +35,3 @@ html, body {
 .grow {
     flex-grow: 1;
 }
-
-.GadgetRows {
-    justify-content: space-evenly;
-    margin-top: 24px;
-}
diff --git a/tank-frontend/src/index.tsx b/tank-frontend/src/index.tsx
index 67c3cc7..07bbf93 100644
--- a/tank-frontend/src/index.tsx
+++ b/tank-frontend/src/index.tsx
@@ -1,51 +1,8 @@
-import React, {useCallback, useState} from 'react';
-import './index.css';
-import ClientScreen from './ClientScreen';
-import Controls from './Controls.tsx';
-import JoinForm from './JoinForm.tsx';
+import React from 'react';
 import {createRoot} from 'react-dom/client';
-import PlayerInfo from './PlayerInfo.tsx';
-import {useStoredObjectState} from './useStoredState.ts';
-import {NameId, postPlayer} from './serverCalls.tsx';
-import Column from "./components/Column.tsx";
-import Row from "./components/Row.tsx";
-import Scoreboard from "./Scoreboard.tsx";
-import Button from "./components/Button.tsx";
+import './index.css';
+import App from "./App.tsx";
 
-const getNewNameId = () => ({
-    id: crypto.randomUUID(),
-    name: ''
-});
-
-function App() {
-    const [nameId, setNameId] = useStoredObjectState<NameId>('access', getNewNameId);
-
-    const [isLoggedIn, setLoggedIn] = useState<boolean>(false);
-    const logout = () => setLoggedIn(false);
-
-    useCallback(async () => {
-        if (isLoggedIn)
-            return;
-        const result = await postPlayer(nameId);
-        setLoggedIn(result !== null);
-    }, [nameId, isLoggedIn])();
-
-    return <Column className='grow'>
-        <Row>
-            <h1 className='grow'>Tanks!</h1>
-            {nameId.name !== '' &&
-                <Button className='PlayerInfo-Reset' onClick={() => setNameId(getNewNameId)} text='x'/>}
-        </Row>
-        <ClientScreen logout={logout}/>
-        {nameId.name === '' && <JoinForm setNameId={setNameId} clientId={nameId.id}/>}
-        {isLoggedIn && <Row className='GadgetRows'>
-            <Controls playerId={nameId.id} logout={logout}/>
-            <PlayerInfo playerId={nameId.id} logout={logout}/>
-            <Scoreboard/>
-        </Row>
-        }
-    </Column>;
-}
 
 createRoot(document.getElementById('root')!).render(
     <React.StrictMode>
diff --git a/tank-frontend/src/useStoredState.ts b/tank-frontend/src/useStoredState.ts
index 212da05..d4fea05 100644
--- a/tank-frontend/src/useStoredState.ts
+++ b/tank-frontend/src/useStoredState.ts
@@ -18,7 +18,7 @@ export function useStoredObjectState<T>(
     const getInitialState = () => {
         const localStorageJson = localStorage.getItem(storageKey);
         if (localStorageJson !== null && localStorageJson !== '') {
-            return JSON.parse(localStorageJson);
+            return JSON.parse(localStorageJson) as T;
         }
 
         return initialState();
@@ -27,8 +27,9 @@ export function useStoredObjectState<T>(
     const [state, setState] = useState<T>(getInitialState);
 
     const setSavedState = (mut: (oldState: T) => T) => {
-        localStorage.setItem(storageKey, JSON.stringify(mut(state)));
-        setState(mut);
+        const newState = mut(state);
+        localStorage.setItem(storageKey, JSON.stringify(newState));
+        setState(newState);
     };
 
     return [state, setSavedState];