First pass at cleaning up the website