clean up UI a bit
Merge branch 'dev'