Fix calculations of cell highlights with better accounting for the separator. iOS specific adjustments. Closes #293.