Edits to CoreBundle layouts