Activity form improvements