Don't use sbs-click anymore.

Plus: added classes so that jquery selector based handling can be applied.
Merge branch 'master' into ams