CSS updates

Chaneg in structure, alphabetization, media queries, general clean up