Fix those clicks
Tweaks for the Sask performance