Fixed bad device row layout