Layout math tweaks - WIP