Reworked navigation to support more classes