Refactors commit block / list to own templates