Added media query support