Update to cewl layout