new buttons in wm, and different expanding functionality