Fixed navigation class method and some minor linting issues