Bugfixes and Refactoring Basti & Simon Menu.js