Content update and minor grid fixes