Merge remote branch 'github/master'
style changes for mobile