small tweaks to approach click handler