fixed forms into new simple format