Made the detail display uneditable
Fixed merge conflict