Order form layout updates