Some fixes on names-screen.
Merge pull request #119 from flokuep/develop

Some fixes on names-screen.