Swap CSS and JS file order to avoid errors
Minor replacements