Better logic for info popup, swipe to go back