fixed navigation problems