Demo web pages, template improvements, bug fixing