Added base html and more templating