Add swipe button and clean up layout