First stab at navigation. Refactored URLs
Merge remote-tracking branch 'origin/master'