[DEV]A lot of navigation improvements