changed the order of the javascript includes