Parallax Effect Rectification

Parallax Effect Rectification
(Both commits need to be taken together)