Minor UI tweaks
Merge branch 'development'