PP Upgrade + Custom Table Layouts