Change Cell Identifiers

Identifiers matches the raw value of the enum type
Fix Model and update Controller

Rewritten Controller Implementation