Refactor top menus to make all manageable

Jason's turn to fixify it now!