Updated the site to use new modules to fix many of the issues we had with layout and content types.