ExpandableListViewAdapter & Design Changes