Cleanup + menufix for index page