changes to layout2