Bug fix and added navigator feature