More work on rights editor