New Zealand to shake up border settings