Continued refactoring of #2575

Took out conditionals that check for each entity type, and changed the
corresponding css for the entities to not be lowercase
Merge pull request #2655 from howdyitshelena/2626

Continued refactoring of #2575