Remove unnecessary row and span4 [MJ-171]