Cleanup, move media queries to own stylesheet