Adding Markdown & Template changes