Fixed navigation problems and reordering