Refactored sidebar-entry.handlebars #2575

Took out the repeated chunks of code which put in the organization, and
only put it after checking for the entities.
Merge pull request #2637 from howdyitshelena/2626

Refactored sidebar-entry.handlebars #2575