Navigation controller and model improvements and tests