Fix formula layout and schema validations...