Fleshing out media queries, correcting some formatting