more minor changes in CButton

Gigi takes over after that :P