Changes to Menu and bugfixes.