updated Vaadin demo
moved code out to separate code pages.