cleared down advanced controllers
set navigation for water advanced calculator
set up advanced baseline form