swipe bug fix and button margins