Refractored and simplified Contribution and Comment views