Added some more markup to the layout.