Update view to Vaadin 7 (cont.)