Welcome screen (v3.6.7): Name and Play mode in wrong order

The Welcome screen shows in the left pane:

  1. Enter your name
  2. Select play mode
  3. Choose side

But in the right pane you first have to enter the play mode, then your name, and then choose side:

This should be easy to modify (left pane text order, right pane headings).