support page work and tiny layout changes