Fix swipe back and custom navigation item issue