745 redefine form flow

same as above here and line 57, I we shouldn't be using the hidden class anywhere