Final changes

* Use a prototype cell instead of a custom cell