Fixing page building