major changes for navigtation and bug fixes