Add merged layouts, add clear icon, music not correct