performance fixes
Merge branch 'master' of https://github.com/rhkiswani/public-site