General Updates

Tidy up the website a bit more