[B1606] Updated code for Main Page Content module.