Conditionals layout fixes
More conditional fixes
Silly conflict
Next exercise testing