More main page fixes
Loads more front-end stuff