tablet and phone style adjustments to fix formatting issues
Merge branch 'hotfix/v1.0.1'