Changed some Vaadin code around to work with the Vaadin 7 API.