CSS refactors so that they're in the right elements

Should still work in firefox, moves us a little closer to "only one thing supposedly broken" in chrome