Formbox updates [MJ-405]

All tests pass.