refactor whole modal forms