Various fixes to the new welcome page system
Merge pull request #26 from jeffdavidgordon/master

Various fixes to the new Welcome Page system