Cleaned up MainListViewAdapter
Merge branch 'Costa'