Fix/pg structure page changes