improve alignment on layout and pages