resolve navigation issues
resolve navigation issues