modified some stuff with navigation