refactor: clean up Welcome
component
#11526
+53
−41
Merged