Existing rules editor

- UI improvements
- Bug fixes