re-factoring claim page