Add media query. Refactoring style for tablet and mobile
Merge remote-tracking branch 'origin/master'