Design and layout

In Progress