Move js to separate file. Change markup