Making multi page form clearer in order to make testing easier