Changed some javascripts to reflect 2.0 conventions