Major code refactoring - used Expandable List instead of the handmade list