improving templates and adding text to demo