Improve default template, integrate more with Markdown