Fixed performance bug + improvement of navigation