Moved media queries and added some comments