Refactored listview into a tableview
Merge commit
Merge commit