New Layout

Need to tweek and change content
Working view