Refactor + non selectable list view for step 4.