Diplomacy Panel Renovation

Fixes #3443

![diplomacy](https://f.cloud.github.com/assets/756669/937828/f39e7afe-00eb-11e3-92a6-5d4c6ffa7d58.png)