Fixed regression issues from new grid layout