Clean-up plus more work on home page