* Refactored cell creation and drawing