More layout tweaks - also include visual grid for playing with
Fix botched find and replace attempt