new buttons are behaving... I'm quite proud