Refactoring menu dependencies (issue #2), minor fixes