Working on Vaadin 7

I got the navigation working on Vaadin 7, at least as a first pass