More ui cleanup
Merge branch 'master' of https://github.com/monjaro/cs304