Added test project
Layout math tweaks - WIP