fixed NaN and changed js file locations