minor cleanup for form layout, enable loading as a file