more work on form layout