* Update UI layout
* Upgrade vaadin version
* Update dynamic query