More navigation wiring plus new classes for navigation