Fixed some navigation issues in settings