Treaty clause changes

I like the new treaty system, but there are some things I would like changed.

Non Aggression:
This is rather annoying. NA mixes both fighting and colonizing restricitions together. It's not very clear whether NA in nuetral/all systems permits colonizing in what systems. I suggest that NA be split up into Non Aggression and No Colonizing clauses, for clarity.

Share System Maps:
This is useless. All you get is that fact that a system exists, and how many stars it has. What you should get is the grayed sight of whatever the other member of the treaty has seen. This goes for anything else related to system maps.

No Intelligence Allowed:
It seems to me that this clause prevents all intelligence, but what if I just want to prevent intelligence against my empire, or between the two involved empires. This clause should have Emp1 cannot perform intelligence against Emp2, for example.

More logical layout:
Right now, there are a lot of seperate options that are rather clunky to read through. It seems like a better idea to have toggleable options with a radio button setup for the specifics.

For example, the Share Technology clause could be set up as so:
[]Share Technology
_[]Emp1 will give selected technology to Emp2
__()4 Levels old ()2 Levels old ()Current ()Current, racial, and unique
_[]Emp2 will give selected technology to Emp1
__()4 Levels old ()2 Levels old ()Current ()Current, racial, and unique

[] = checkbox, () = radio button