improve layout and schemas