ExpendableListView fixes