Add navigation and fix URL generation.