Main menu upgrade: fix and rename