Some form layout improvements