Add more improvements to Welcome\prepare screen