2.3 layout fixes