Updated the way PGQ was layed out