About to overhaul welcome and user experience