Pulled code
Added code for list-view
Pulleds code of develop