* Fixed navigation issues