Added Layouts

-- Added additional layout options, restructured how layouts style is
added.