Improve script/css includes on page