Re-ordered the css and js in order