Rename layouts and create one for task list