Changed this, that, and the other thing
simplified datacontrol and javascript methods