Fixing content cell clicking bugs