new buttons, new layout