Fix up tab order