clean up and add menu edge swipe