Add ButtonView and ButtonGesture.
Tweak to remove compiler warnings.