small UI fixes
Merge branch 'develop'