Finalize initial layout

Complete the layout and markup, ready to get filled