moving stuff out to modules, removing bubbled media query that I'd missed