Added js and collapse