Button tweaks, again...