Cleanup homepage, and WIP on pub page