fix toolbar navigation issues