More work on matching layout/look from C# version for main menu