Fixes number padding
Merge branch 'hotfix/ui-fixes'