Fixing gulp file
Media queries and some adjustments