Fixing formatting and Onload issues.