Pushing to get yer smelly updates

Did some work on the splashscreen, it now appears on startup. Now to get
the selection working...
Fixed conflicts

We'll use yer code instead of mine, yers is bettor.