UI fixes
Merge branch 'master' of https://github.com/quappi/Columbus