Content Update

Updating the content from the client and making changes to the HTML
structure to reflect that.