updated mobile styles
merge conflict