Finalised most of the layout.
Finalised most of the layout