Form view improvements