Origin and centering fixes

Fixes centering issue