More minor tweaks. I realize I'm being annoying with my perfectionist traits
Merge pull request #9 from dawsonbotsford/screen_optimization

More minor tweaks.