more layout updates to case and children
merge error