Some refactoring and logic adding to results page
Navigation added, cucumber failing left, right and centre