Intermediate changes to layout and pages

temp commit