Custom tab order now REALLY working