Updated files and begun to sort jscript and header/footer implementation