changed include order of javascripts