fixed collapse issues, and changed css js to be local