Better form and config