Updating forms

@mnzaki