Fix class= & move js before </body> tag. Minor changes