Merge / tidy option pane controls in SetupMenuWindowControls

one small nugget left to check though