added new UI Management of buttons.
adapted to UI classes.