Fix waypoint,new waypoint,modifying waypoint activities and layouts