UiT-16: refactor activity forms.