I didn't like that icon
Fix some interactions between editor & layout