Tap button tweaks