Change on-click to on-tap