Fixes for showing data on the cells and some code cleanup