Hoang:
 - update UI for cells