diff --git a/components/DropdownMenuContent/index.scss b/components/DropdownMenuContent/index.scss
index 96fa2040..e1536c42 100644
--- a/components/DropdownMenuContent/index.scss
+++ b/components/DropdownMenuContent/index.scss
@@ -4,10 +4,9 @@
   border-radius: 6px;
   box-shadow: 0 1px 4px rgb(0 0 0 / 8%);
   box-sizing: border-box;
-  min-width: 30vw;
+  width: 30vw;
+  max-width: 180px;
   margin: 0 $unit-2x;
-  // top: $unit-8x; // This shouldn't be hardcoded. How to calculate it?
-  // Also, add space that doesn't make the menu disappear if you move your mouse slowly
   z-index: 15;
 
   @include breakpoint(phone) {
diff --git a/components/Header/index.tsx b/components/Header/index.tsx
index d17defde..bae9e7be 100644
--- a/components/Header/index.tsx
+++ b/components/Header/index.tsx
@@ -1,5 +1,6 @@
 import React, { useEffect, useState } from 'react'
-import { useSnapshot } from 'valtio'
+import { subscribe, useSnapshot } from 'valtio'
+import { subscribeKey } from 'valtio/utils'
 import { deleteCookie } from 'cookies-next'
 import { useRouter } from 'next/router'
 import { Trans, useTranslation } from 'next-i18next'
@@ -9,7 +10,7 @@ import Link from 'next/link'
 
 import api from '~utils/api'
 import { accountState, initialAccountState } from '~utils/accountState'
-import { appState } from '~utils/appState'
+import { appState, initialAppState } from '~utils/appState'
 
 import {
   DropdownMenu,
@@ -49,28 +50,25 @@ const Header = () => {
   const [settingsModalOpen, setSettingsModalOpen] = useState(false)
   const [leftMenuOpen, setLeftMenuOpen] = useState(false)
   const [rightMenuOpen, setRightMenuOpen] = useState(false)
+
+  const [name, setName] = useState('')
   const [originalName, setOriginalName] = useState('')
 
   // Snapshots
   const { account } = useSnapshot(accountState)
-  const { party } = useSnapshot(appState)
+  const { party: partySnapshot } = useSnapshot(appState)
 
-  function handleCopyToastOpenChanged(open: boolean) {
-    setCopyToastOpen(open)
-  }
+  // Subscribe to app state to listen for party name and
+  // unsubscribe when component is unmounted
+  const unsubscribe = subscribe(appState, () => {
+    const newName =
+      appState.party && appState.party.name ? appState.party.name : ''
+    setName(newName)
+  })
 
-  function handleCopyToastCloseClicked() {
-    setCopyToastOpen(false)
-  }
-
-  function handleRemixToastOpenChanged(open: boolean) {
-    setRemixToastOpen(open)
-  }
-
-  function handleRemixToastCloseClicked() {
-    setRemixToastOpen(false)
-  }
+  useEffect(() => () => unsubscribe(), [])
 
+  // Methods: Event handlers (Buttons)
   function handleLeftMenuButtonClicked() {
     setLeftMenuOpen(!leftMenuOpen)
   }
@@ -79,9 +77,11 @@ const Header = () => {
     setRightMenuOpen(!rightMenuOpen)
   }
 
+  // Methods: Event handlers (Menus)
   function handleLeftMenuOpenChange(open: boolean) {
     setLeftMenuOpen(open)
   }
+
   function handleRightMenuOpenChange(open: boolean) {
     setRightMenuOpen(open)
   }
@@ -94,6 +94,41 @@ const Header = () => {
     setRightMenuOpen(false)
   }
 
+  // Methods: Event handlers (Copy toast)
+  function handleCopyToastOpenChanged(open: boolean) {
+    setCopyToastOpen(open)
+  }
+
+  function handleCopyToastCloseClicked() {
+    setCopyToastOpen(false)
+  }
+
+  // Methods: Event handlers (Remix toasts)
+  function handleRemixToastOpenChanged(open: boolean) {
+    setRemixToastOpen(open)
+  }
+
+  function handleRemixToastCloseClicked() {
+    setRemixToastOpen(false)
+  }
+
+  // Methods: Actions
+  function handleNewParty(event: React.MouseEvent, path: string) {
+    event.preventDefault()
+
+    // Clean state
+    const resetState = clonedeep(initialAppState)
+    Object.keys(resetState).forEach((key) => {
+      appState[key] = resetState[key]
+    })
+
+    // Push the root URL
+    router.push(path)
+
+    // Close right menu
+    closeRightMenu()
+  }
+
   function copyToClipboard() {
     const path = router.asPath.split('/')[1]
 
@@ -111,16 +146,6 @@ const Header = () => {
     }
   }
 
-  function handleNewParty(event: React.MouseEvent, path: string) {
-    event.preventDefault()
-
-    // Push the root URL
-    router.push(path)
-
-    // Close right menu
-    closeRightMenu()
-  }
-
   function logout() {
     // Close menu
     closeRightMenu()
@@ -139,38 +164,39 @@ const Header = () => {
     return false
   }
 
-  function toggleFavorite() {
-    if (party.favorited) unsaveFavorite()
-    else saveFavorite()
-  }
-
-  function saveFavorite() {
-    if (party.id)
-      api.saveTeam({ id: party.id }).then((response) => {
-        if (response.status == 201) appState.party.favorited = true
-      })
-    else console.error('Failed to save team: No party ID')
-  }
-
-  function unsaveFavorite() {
-    if (party.id)
-      api.unsaveTeam({ id: party.id }).then((response) => {
-        if (response.status == 200) appState.party.favorited = false
-      })
-    else console.error('Failed to unsave team: No party ID')
-  }
-
   function remixTeam() {
-    setOriginalName(party.name ? party.name : t('no_title'))
+    setOriginalName(partySnapshot.name ? partySnapshot.name : t('no_title'))
 
-    if (party.shortcode)
-      api.remix(party.shortcode).then((response) => {
+    if (partySnapshot.shortcode)
+      api.remix(partySnapshot.shortcode).then((response) => {
         const remix = response.data.party
         router.push(`/p/${remix.shortcode}`)
         setRemixToastOpen(true)
       })
   }
 
+  function toggleFavorite() {
+    if (partySnapshot.favorited) unsaveFavorite()
+    else saveFavorite()
+  }
+
+  function saveFavorite() {
+    if (partySnapshot.id)
+      api.saveTeam({ id: partySnapshot.id }).then((response) => {
+        if (response.status == 201) appState.party.favorited = true
+      })
+    else console.error('Failed to save team: No party ID')
+  }
+
+  function unsaveFavorite() {
+    if (partySnapshot.id)
+      api.unsaveTeam({ id: partySnapshot.id }).then((response) => {
+        if (response.status == 200) appState.party.favorited = false
+      })
+    else console.error('Failed to unsave team: No party ID')
+  }
+
+  // Rendering: Elements
   const pageTitle = () => {
     let title = ''
     let hasAccessory = false
@@ -226,6 +252,41 @@ const Header = () => {
     return image
   }
 
+  // Rendering: Buttons
+  const saveButton = () => {
+    return (
+      <Tooltip content={t('tooltips.save')}>
+        <Button
+          leftAccessoryIcon={<SaveIcon />}
+          className={classNames({
+            Save: true,
+            Saved: partySnapshot.favorited,
+          })}
+          blended={true}
+          text={
+            partySnapshot.favorited ? t('buttons.saved') : t('buttons.save')
+          }
+          onClick={toggleFavorite}
+        />
+      </Tooltip>
+    )
+  }
+
+  const remixButton = () => {
+    return (
+      <Tooltip content={t('tooltips.remix')}>
+        <Button
+          leftAccessoryIcon={<RemixIcon />}
+          className="Remix"
+          blended={true}
+          text={t('buttons.remix')}
+          onClick={remixTeam}
+        />
+      </Tooltip>
+    )
+  }
+
+  // Rendering: Toasts
   const urlCopyToast = () => {
     return (
       <Toast
@@ -258,37 +319,7 @@ const Header = () => {
     )
   }
 
-  const saveButton = () => {
-    return (
-      <Tooltip content={t('tooltips.save')}>
-        <Button
-          leftAccessoryIcon={<SaveIcon />}
-          className={classNames({
-            Save: true,
-            Saved: party.favorited,
-          })}
-          blended={true}
-          text={party.favorited ? t('buttons.saved') : t('buttons.save')}
-          onClick={toggleFavorite}
-        />
-      </Tooltip>
-    )
-  }
-
-  const remixButton = () => {
-    return (
-      <Tooltip content={t('tooltips.remix')}>
-        <Button
-          leftAccessoryIcon={<RemixIcon />}
-          className="Remix"
-          blended={true}
-          text={t('buttons.remix')}
-          onClick={remixTeam}
-        />
-      </Tooltip>
-    )
-  }
-
+  // Rendering: Modals
   const settingsModal = () => {
     const user = accountState.account.user
 
@@ -317,6 +348,7 @@ const Header = () => {
     )
   }
 
+  // Rendering: Compositing
   const left = () => {
     return (
       <section>
@@ -348,7 +380,7 @@ const Header = () => {
       <section>
         {router.route === '/p/[party]' &&
         account.user &&
-        (!party.user || party.user.id !== account.user.id) &&
+        (!partySnapshot.user || partySnapshot.user.id !== account.user.id) &&
         !appState.errorCode
           ? saveButton()
           : ''}
diff --git a/components/PartyDetails/index.scss b/components/PartyDetails/index.scss
index 0b0fb4c3..a6306701 100644
--- a/components/PartyDetails/index.scss
+++ b/components/PartyDetails/index.scss
@@ -37,7 +37,6 @@
 
       &.Visible {
         display: grid;
-        grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
       }
 
       fieldset {
@@ -340,6 +339,18 @@
           font-size: $font-small;
         }
 
+        a:visited:not(.fire):not(.water):not(.wind):not(.earth):not(.dark):not(
+            .light
+          ) {
+          color: var(--text-primary);
+        }
+
+        a:hover:not(.fire):not(.water):not(.wind):not(.earth):not(.dark):not(
+            .light
+          ) {
+          color: $blue;
+        }
+
         & > *:not(:last-child):after {
           content: ' · ';
           margin: 0 calc($unit / 2);
diff --git a/components/PartyDetails/index.tsx b/components/PartyDetails/index.tsx
index 369016be..646da2c3 100644
--- a/components/PartyDetails/index.tsx
+++ b/components/PartyDetails/index.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useState, ChangeEvent, KeyboardEvent } from 'react'
 import Link from 'next/link'
 import { useRouter } from 'next/router'
-import { useSnapshot } from 'valtio'
+import { subscribe, useSnapshot } from 'valtio'
 import { useTranslation } from 'next-i18next'
 import clonedeep from 'lodash.clonedeep'
 
@@ -25,7 +25,7 @@ import Token from '~components/Token'
 
 import api from '~utils/api'
 import { accountState } from '~utils/accountState'
-import { appState } from '~utils/appState'
+import { appState, initialAppState } from '~utils/appState'
 import { formatTimeAgo } from '~utils/timeAgo'
 import { youtube } from '~utils/youtube'
 
@@ -124,6 +124,26 @@ const PartyDetails = (props: Props) => {
     }
   }, [props.party])
 
+  // Subscribe to router changes and reset state
+  // if the new route is a new team
+  useEffect(() => {
+    router.events.on('routeChangeStart', (url, { shallow }) => {
+      if (url === '/new' || url === '/') {
+        const party = initialAppState.party
+
+        setName(party.name ? party.name : '')
+        setAutoGuard(party.autoGuard)
+        setFullAuto(party.fullAuto)
+        setChargeAttack(party.chargeAttack)
+        setClearTime(party.clearTime)
+        setRemixes(party.remixes)
+        setTurnCount(party.turnCount)
+        setButtonCount(party.buttonCount)
+        setChainCount(party.chainCount)
+      }
+    })
+  }, [])
+
   useEffect(() => {
     // Extract the video IDs from the description
     if (appState.party.description) {
@@ -475,161 +495,163 @@ const PartyDetails = (props: Props) => {
     }
   }
 
-  const editable = (
-    <section className={editableClasses}>
-      <CharLimitedFieldset
-        fieldName="name"
-        placeholder="Name your team"
-        value={props.party?.name}
-        limit={50}
-        onChange={handleInputChange}
-        error={errors.name}
-        ref={nameInput}
-      />
-      <RaidDropdown
-        showAllRaidsOption={false}
-        currentRaid={props.party?.raid ? props.party?.raid.slug : undefined}
-        onChange={receiveRaid}
-      />
-      <ul className="SwitchToggleGroup DetailToggleGroup">
-        <li className="Ougi ToggleSection">
-          <label htmlFor="ougi">
-            <span>{t('party.details.labels.charge_attack')}</span>
-            <div>
-              <Switch
-                name="charge_attack"
-                onCheckedChange={handleChargeAttackChanged}
-                value={switchValue(chargeAttack)}
-                checked={chargeAttack}
-              />
-            </div>
-          </label>
-        </li>
-        <li className="FullAuto ToggleSection">
-          <label htmlFor="full_auto">
-            <span>{t('party.details.labels.full_auto')}</span>
-            <div>
-              <Switch
-                onCheckedChange={handleFullAutoChanged}
-                name="full_auto"
-                value={switchValue(fullAuto)}
-                checked={fullAuto}
-              />
-            </div>
-          </label>
-        </li>
-        <li className="AutoGuard ToggleSection">
-          <label htmlFor="auto_guard">
-            <span>{t('party.details.labels.auto_guard')}</span>
-            <div>
-              <Switch
-                onCheckedChange={handleAutoGuardChanged}
-                name="auto_guard"
-                value={switchValue(autoGuard)}
-                disabled={!fullAuto}
-                checked={autoGuard}
-              />
-            </div>
-          </label>
-        </li>
-      </ul>
-      <ul className="InputToggleGroup DetailToggleGroup">
-        <li className="InputSection">
-          <label htmlFor="auto_guard">
-            <span>{t('party.details.labels.button_chain')}</span>
-            <div className="Input Bound">
+  const editable = () => {
+    return (
+      <section className={editableClasses}>
+        <CharLimitedFieldset
+          fieldName="name"
+          placeholder="Name your team"
+          value={props.party?.name}
+          limit={50}
+          onChange={handleInputChange}
+          error={errors.name}
+          ref={nameInput}
+        />
+        <RaidDropdown
+          showAllRaidsOption={false}
+          currentRaid={props.party?.raid ? props.party?.raid.slug : undefined}
+          onChange={receiveRaid}
+        />
+        <ul className="SwitchToggleGroup DetailToggleGroup">
+          <li className="Ougi ToggleSection">
+            <label htmlFor="ougi">
+              <span>{t('party.details.labels.charge_attack')}</span>
+              <div>
+                <Switch
+                  name="charge_attack"
+                  onCheckedChange={handleChargeAttackChanged}
+                  value={switchValue(chargeAttack)}
+                  checked={chargeAttack}
+                />
+              </div>
+            </label>
+          </li>
+          <li className="FullAuto ToggleSection">
+            <label htmlFor="full_auto">
+              <span>{t('party.details.labels.full_auto')}</span>
+              <div>
+                <Switch
+                  onCheckedChange={handleFullAutoChanged}
+                  name="full_auto"
+                  value={switchValue(fullAuto)}
+                  checked={fullAuto}
+                />
+              </div>
+            </label>
+          </li>
+          <li className="AutoGuard ToggleSection">
+            <label htmlFor="auto_guard">
+              <span>{t('party.details.labels.auto_guard')}</span>
+              <div>
+                <Switch
+                  onCheckedChange={handleAutoGuardChanged}
+                  name="auto_guard"
+                  value={switchValue(autoGuard)}
+                  disabled={!fullAuto}
+                  checked={autoGuard}
+                />
+              </div>
+            </label>
+          </li>
+        </ul>
+        <ul className="InputToggleGroup DetailToggleGroup">
+          <li className="InputSection">
+            <label htmlFor="auto_guard">
+              <span>{t('party.details.labels.button_chain')}</span>
+              <div className="Input Bound">
+                <Input
+                  name="buttons"
+                  type="number"
+                  placeholder="0"
+                  value={`${buttonCount}`}
+                  min="0"
+                  max="99"
+                  onChange={handleButtonCountInput}
+                  onKeyDown={handleInputKeyDown}
+                />
+                <span>b</span>
+                <Input
+                  name="chains"
+                  type="number"
+                  placeholder="0"
+                  min="0"
+                  max="99"
+                  value={`${chainCount}`}
+                  onChange={handleChainCountInput}
+                  onKeyDown={handleInputKeyDown}
+                />
+                <span>c</span>
+              </div>
+            </label>
+          </li>
+          <li className="InputSection">
+            <label htmlFor="auto_guard">
+              <span>{t('party.details.labels.turn_count')}</span>
               <Input
-                name="buttons"
+                name="turn_count"
+                className="AlignRight Bound"
                 type="number"
+                step="1"
+                min="1"
+                max="999"
                 placeholder="0"
-                value={`${buttonCount}`}
-                min="0"
-                max="99"
-                onChange={handleButtonCountInput}
+                value={`${turnCount}`}
+                onChange={handleTurnCountInput}
                 onKeyDown={handleInputKeyDown}
               />
-              <span>b</span>
-              <Input
-                name="chains"
-                type="number"
-                placeholder="0"
-                min="0"
-                max="99"
-                value={`${chainCount}`}
-                onChange={handleChainCountInput}
-                onKeyDown={handleInputKeyDown}
-              />
-              <span>c</span>
-            </div>
-          </label>
-        </li>
-        <li className="InputSection">
-          <label htmlFor="auto_guard">
-            <span>{t('party.details.labels.turn_count')}</span>
-            <Input
-              name="turn_count"
-              className="AlignRight Bound"
-              type="number"
-              step="1"
-              min="1"
-              max="999"
-              placeholder="0"
-              value={`${turnCount}`}
-              onChange={handleTurnCountInput}
-              onKeyDown={handleInputKeyDown}
-            />
-          </label>
-        </li>
-        <li className="InputSection">
-          <label htmlFor="auto_guard">
-            <span>{t('party.details.labels.clear_time')}</span>
-            <div>
-              <DurationInput
-                name="clear_time"
-                className="Bound"
-                placeholder="00:00"
-                value={clearTime}
-                onValueChange={(value: number) => handleClearTimeInput(value)}
-              />
-            </div>
-          </label>
-        </li>
-      </ul>
-      <TextFieldset
-        fieldName="name"
-        placeholder={
-          'Write your notes here\n\n\nWatch out for the 50% trigger!\nMake sure to click Fediel’s 3 first\nGood luck with RNG!'
-        }
-        value={props.party?.description}
-        onChange={handleTextAreaChange}
-        error={errors.description}
-        ref={descriptionInput}
-      />
+            </label>
+          </li>
+          <li className="InputSection">
+            <label htmlFor="auto_guard">
+              <span>{t('party.details.labels.clear_time')}</span>
+              <div>
+                <DurationInput
+                  name="clear_time"
+                  className="Bound"
+                  placeholder="00:00"
+                  value={clearTime}
+                  onValueChange={(value: number) => handleClearTimeInput(value)}
+                />
+              </div>
+            </label>
+          </li>
+        </ul>
+        <TextFieldset
+          fieldName="name"
+          placeholder={
+            'Write your notes here\n\n\nWatch out for the 50% trigger!\nMake sure to click Fediel’s 3 first\nGood luck with RNG!'
+          }
+          value={props.party?.description}
+          onChange={handleTextAreaChange}
+          error={errors.description}
+          ref={descriptionInput}
+        />
 
-      <div className="bottom">
-        <div className="left">
-          {router.pathname !== '/new' ? (
+        <div className="bottom">
+          <div className="left">
+            {router.pathname !== '/new' ? (
+              <Button
+                leftAccessoryIcon={<CrossIcon />}
+                className="Blended medium destructive"
+                onClick={handleClick}
+                text={t('buttons.delete')}
+              />
+            ) : (
+              ''
+            )}
+          </div>
+          <div className="right">
+            <Button text={t('buttons.cancel')} onClick={toggleDetails} />
             <Button
-              leftAccessoryIcon={<CrossIcon />}
-              className="Blended medium destructive"
-              onClick={handleClick}
-              text={t('buttons.delete')}
+              leftAccessoryIcon={<CheckIcon className="Check" />}
+              text={t('buttons.save_info')}
+              onClick={updateDetails}
             />
-          ) : (
-            ''
-          )}
+          </div>
         </div>
-        <div className="right">
-          <Button text={t('buttons.cancel')} onClick={toggleDetails} />
-          <Button
-            leftAccessoryIcon={<CheckIcon className="Check" />}
-            text={t('buttons.save_info')}
-            onClick={updateDetails}
-          />
-        </div>
-      </div>
-    </section>
-  )
+      </section>
+    )
+  }
 
   const clearTimeString = () => {
     const minutes = Math.floor(clearTime / 60)
@@ -664,38 +686,46 @@ const PartyDetails = (props: Props) => {
     }
   }
 
-  const readOnly = (
-    <section className={readOnlyClasses}>
-      <section className="Details">
-        <Token className={classNames({ ChargeAttack: true, On: chargeAttack })}>
-          {`${t('party.details.labels.charge_attack')} ${
-            chargeAttack ? 'On' : 'Off'
-          }`}
-        </Token>
-
-        <Token className={classNames({ FullAuto: true, On: fullAuto })}>
-          {`${t('party.details.labels.full_auto')} ${fullAuto ? 'On' : 'Off'}`}
-        </Token>
-
-        <Token className={classNames({ AutoGuard: true, On: autoGuard })}>
-          {`${t('party.details.labels.auto_guard')} ${fullAuto ? 'On' : 'Off'}`}
-        </Token>
-
-        {turnCount ? (
-          <Token>
-            {t('party.details.turns.with_count', {
-              count: turnCount,
-            })}
+  const readOnly = () => {
+    return (
+      <section className={readOnlyClasses}>
+        <section className="Details">
+          <Token
+            className={classNames({ ChargeAttack: true, On: chargeAttack })}
+          >
+            {`${t('party.details.labels.charge_attack')} ${
+              chargeAttack ? 'On' : 'Off'
+            }`}
           </Token>
-        ) : (
-          ''
-        )}
-        {clearTime > 0 ? <Token>{clearTimeString()}</Token> : ''}
-        {buttonChainToken()}
+
+          <Token className={classNames({ FullAuto: true, On: fullAuto })}>
+            {`${t('party.details.labels.full_auto')} ${
+              fullAuto ? 'On' : 'Off'
+            }`}
+          </Token>
+
+          <Token className={classNames({ AutoGuard: true, On: autoGuard })}>
+            {`${t('party.details.labels.auto_guard')} ${
+              fullAuto ? 'On' : 'Off'
+            }`}
+          </Token>
+
+          {turnCount ? (
+            <Token>
+              {t('party.details.turns.with_count', {
+                count: turnCount,
+              })}
+            </Token>
+          ) : (
+            ''
+          )}
+          {clearTime > 0 ? <Token>{clearTimeString()}</Token> : ''}
+          {buttonChainToken()}
+        </section>
+        <Linkify>{embeddedDescription}</Linkify>
       </section>
-      <Linkify>{embeddedDescription}</Linkify>
-    </section>
-  )
+    )
+  }
 
   const remixSection = () => {
     return (
@@ -755,8 +785,8 @@ const PartyDetails = (props: Props) => {
             ''
           )}
         </div>
-        {readOnly}
-        {editable}
+        {readOnly()}
+        {editable()}
 
         {deleteAlert()}
       </section>
diff --git a/pages/new/index.tsx b/pages/new/index.tsx
index 86907577..dc4fe4c9 100644
--- a/pages/new/index.tsx
+++ b/pages/new/index.tsx
@@ -35,8 +35,7 @@ const NewRoute: React.FC<Props> = ({
   const router = useRouter()
 
   function callback(path: string) {
-    // This is scuffed, how do we do this natively?
-    window.history.replaceState(null, `Grid Tool`, `${path}`)
+    router.push(path, undefined, { shallow: true })
   }
 
   useEffect(() => {