top menus refactoring