lots of improves in menu refactoring