View claim page & bunch of refactoring to patterns