Build for layout fixes