Fixed bug when navigation using cells versuss rows.