Page label fixes