Added Swipe tabs and included Maps