Added more views and code for the expandable lists