page class fixes