Minor UI Fixes
Merge branch 'hotfix/1.5.4'