Cleanup settings ui

Fixes a usability issue: the poorness of our settings ui. Is a significant improvement over the current state, imo. 
@jmecosta, @typz, @Bertk, @guwirth: What do you guys think?