navigation finally fixed