pull from demo1 into gh-pages

better styles and page layout and only a slight change to one ddt (adding a div around the table template)