Main menu upgrade: fix layout bug