Changed - Refactored nav templates