fixed issues in navigation