Another media query refactor, as well as the clearing code