Re-ordered Packet registration, Fixed shift click for Plans