Current main-menu item selection improvement