Updated id's and js