Bottom menu and more cleanup