Correct info collisions and edge of screen issues
Merge pull request #359 from norem/development

Correct info collisions and edge of screen issues