Added several options and improved the way media queries are ordered