Changes to shuffle rule logic
Shuffle rule gui changes