Navigation bugs improved