refactored ER schema, added forms