Layout and pages updates