UI fixes
Merge branch 'develop' of https://github.com/Vatsinator/Vatsinator into develop