some refactoring
Re-arrange menus