Changing Layout further

Attempts to further understand the box model and to change layout to
match new schematic