Menu bugfixes and aesthetics