move tokeninputs to form