Improve tab order.