updated to use new map / list hybrid view