Move around responsibility of row container creation