Small UI fixes

In its current state (okay to merge, might add more stuff) it takes care of #316 and #318 

/cc @tpetr @wsorenson @timmfin