updating UI on detailview
updated UI, fixed merge conflict