Support next text field switching with fields on the same row

Thanks to @duncanjimbo and colleagues