Some navigation update. Still slow as hell though