new layout plus buttons added