modify the expandable adatper and add layout of group and child
fix conflict