Conditionals layout fixes