fix errors for forms, change message model design