added media queries
merge