Menu improvements and bugfixes