Fixed some navigation issues