S1 new claim/navigation/tracking. Non-compilable in this commit, needs to be merged with changes made on David A's laptop for newClaim to work on the very first page (otherwise you are stuck on the timeout page).
Fix merge conflict