Add form view, refactor click argument transformers