Fix order of js includes