Updates to clean up site, ready for review