Adds listView
Fixes merge