Cleaning up, fixing main page