UI-2546: welcome screen - fix bugs