Hotfix/refactor form for