Vaadin widget wizard is improved (#12862 ).

Change-Id: I5fb799fd981b00fe541516737bf61e025bfb61c9