New layout to help put logic out of blueprints