[Welcome Screens] Fix some  Regression due to Relooking