Refactor page so only one nav module appears
Remove commented out code