Refactor "Awaiting review" display. Closes #468