Fix double Swipe Right & Add Menu
fix double swipe & others bugs