Added markers to map, changed map implementation, changed listview to tableview and cleaned up some code