Added some media query support