cleaning up styling on mobile
cleaned up some merge conflicts and minor style changes