Fixed pixel line up issue and scaling