Updated all forms after Team Review