front-end changes
merge
details page front-end
merge