major templates refactoring in claimant area