Fix field order in nab bar so that tabbing between fields makes sense