Changed gulp script and layout changes