MenuHandler implemented and MenuLookup cleanup and refactoring made