fixed some navigation problems