Finish fixing up main content.