minor code formatting
Upgrading Nav class to RC5 and making it work with new routes format