Added ExpandableListView support, code cleaning, refactoring