Refactoring of menu and positioning