adding some splashpage stuff
Merge branch 'splashpage'