Address pages tweaks