Remove nested event listener, buttons fully functional