More front-end work. Markup is messy right now (dont judge me..)