Added cell renderer. Need to fix some bugs