Commentary layout updated