Fixed z shifting for 1 plane
Fixed Z shift bug and added constant z offset
Fixed merge conflicts