First shot at optimizing page load
Merge pull request #88 from alicoding/bug1100732

First shot at optimizing page load