Added listView
Merge branch 'Pilon'