Refactored UI/Form to new parent