Did some more work cleaning up the last css cruft
Merge pull request #1009 from brooksryba/develop

Develop