Fixed navigation issues in evalutor app