Work on refactored Form component