[UNSTABLE] Improved the new navigation