major changes to layout 2x2