Finish of chapter 23
Added detail view