Finished refactoring @media queries