Added buttons and functionality to the buttons as a way to replace swipes right now
Merge stuff