Map view is basically done, basis of list view added