Some more impvrovements for buttons.