Add container partial.
Reorder components and style pre text.