More tweaks for a.button