Refactored navigation so they use the same markup