small screen fixes
Merge pull request #1 from Yaneraz/dev

small screen fixes