Many conditional layout improvements