Navigator : improvements + drawing in progress