New Layout

Update the layout, stying and design