Added Media Queries and removed old selectors