fixed layout with new buttons