Menu styles
Merge branch 'master' into fredley
Fix editing so that it uses MD source