css merged and some media queries added