The Government has set out a new plan that should help avoid last-minute flight disruptions this summer.