Refactored out and added navigation to Defence part of the claim