TopMenu changes WIP