Cell highlighting now highlights the correct cell.