layout changes for detail view
fixed merge conflict