Updating Layouts for v11