Merge branch 'hotfix/1.7.4'
CSS layout tweaks for smaller screens
Merge branch 'hotfix/1.7.5' into develop