Add some naming screen stuff.
Merge pull request #134 from iimarckus/oakintro

Add some naming screen stuff.