Continued the implementation of map and list views.