Expandable list added
minor refactoring
minor refactoring
basket list added