Fixing page bugs