cleaned up claim details page a bit
fixed a merge conflict
fixed merge conflicts
Merge pull request #186 from ministryofjustice/front-end/claimtype

cleaned up claim details page a bit