Move setup titles underneath the elements
Add icons to mode picker
Improve styles of zone picker
Improve picker styles for consistency

The two pickers now line up nicely.