Refactored and added interchange media queries