Improving onload to rely more on jQuery
Reorganizing loading code
Minor comment changes