Speed up /welcome transition
Fix for mis-clicking buttons in welcome flow
Improve /welcome