form layout fixes