#484 - Cross Site Navigation - code tidy