New Layout
wip
content and css changes