Added some navigation changes and Swipe Gesture