Integrated changes for the _list view