Navigator : improvements + finished drawing