Added adding/editing forms, enhanced prototype cells