Added js and clean up