Fixed lag and added swipe