Added row and span classes