Fix buttons and add gesture recognizer