Added Support for other Media Queries

Robust overhaul of media queries