added swipebox, and buttons improvment