commit for detailview and some fixing