added expand collapse for html and some changes