Main menu fixes / improvements

changes are highlighted in yellow in the following screenshot:

![2013-03-24_12-18-17_GitExt_Menu_Structure ods - LibreOffice Calc](https://f.cloud.github.com/assets/368412/295287/189357c2-9476-11e2-829c-44fcc73f9de4.jpg)