improving form layout a bit