Refactored UI

Refactored the ui a bit to switch panels more consistently.  Needs real
tabs, though.