added some media queries to css
merged css conflicts