Fixed some boundary conditions displaying row/column data