Tweaked welcome and home