Fix to some pixel grid alignment issues
Merge pull request #784 from Shaners/develop

Fix to some pixel grid alignment issues