Some more work on the create form