Updated some of the content and layout