Rules page cleanup
Preserve order of rules