Add not null constraints, simple layout