This should become more readable again once we move the new comment container out of the scroll template