0.3.x UI Changes

Submitted for review. **Incomplete** but functional and won't break anything.

Progress tracking available on #140 

@tpetr @wsorenson @gchomatas 
Argh that slipped by me. That line is actually supposed to be in the next commit, too, not this one. My mistake.

I'll sort it out Monday.