changed order to load js files