Optimizing layout process by taking advantage of constant time dictio…

…nary access + saving a few unnecessary layout calls