Fixing the layout with the new buttons