Main menu level improvements

Main menu level improvements