improved templates
updated js and css
updated TODO