UI tweak
Merge branch 'hotfix/1.7.4'