Integrated origin/ready/layout-fix