Chp 2.3 buttons edited