Add a few more comments and rearrange core-media-query
add breakpoints for smaller screens