Menu changes and bug cleanup