Updated layout further

Signed-off-by: Dalton Pelc <daltonjpelc@gmail.com>