Challenge pages fixes