better layout for build