Added better buttons, removed swipe gestures; func