fixup! FE: Refactor forms