Reverted back to single click. Unusable on mobile
Merge branch 'master' into gh-pages