row and span tidy up