ui cleanup and updates
Merge branch 'master' of https://github.com/Fl0r14n/CDPS