Tabs and menu label

- a work around for the "dMenuItem" label showing in 2.9.5 instead of the correct text
- some more space/tab inconsistencies

And my merge of Paul's changes from Master - not sure that they should be here, let me know if you want me to redo this.