Changed page architecture and overall layout