Linked up db and data Service, fixed swipe menu to work with map