Trying to fix nested forms