Updates to styles
Merge branch 'master'
Small handset fixes