Merge branch 'hotfix/2.1.4'
change spaceing to fix on small devices
Merge branch 'hotfix/2.1.5' into develop