Merge "Add edit and delete buttons to zen rules"