New Layout

Implementing a new layout and some placeholders