reworking so counters will be clickable elements
merge with gmp26