A LOT of git dancing. Made some changes to my figma design based off what we have discussed on discord.