Rebuilt the nav. Well-commented and proper architecture