listview mod
Listview mode changes
Merge branch 'dhwz'