Performance tuning

Various minor enhancements which take initial page load time from 8.81 seconds to 6 seconds