Missing spaces in tooltips
Reverting reapplying layout on changing naming preference