Reorganizing
Fixed inability to remove rule in rule editor