Re-rorganized panel context menu

From #2824

![screenshot from 2014-01-15 14 13 37](https://f.cloud.github.com/assets/1816681/1924983/5108bedc-7e2a-11e3-88cf-191d8bdc54dc.png)

Conflicts #2823