Made additional modifications to basic-nav code