r1537 + rearrnage RS poll management pages