Did some more work cleaning up the last css cruft