Change to SASS and media query fix