issue #18864: Move country above state. Tweak CSS.
issue #18864: Fix css so labels always show for pickers.
merge
Merge pull request #107 from shackbarth/18864

issue #18864: country/state and issue #18820: search labels