Updated WebsiteTemplate. Minor bugs.