Better page link management