ControlButtons cleaned up and implemented as ButtonCollection