Enhanced welcome page stuff greatly
fixing conflicts
Xixia our savior