Added major navigation and two subclasses