Javascript files now load in correct order