Conditionals layout fixes
More conditional fixes
Yet more conditionals fixes
Silly conflict