Some changes for form layouts