Update readme
Improve templates