Main menu upgrade: fix layout again