When we have time to re-write all of that logic we will be ...

Suggestions are always helpful, but we do know that this can be confusing to use and will be re-writting the Admin in a future release ...