Release1 layout fixes