More tweaks to buttons, and tap-highlight