Updated UI forms