Format menu code

Let's keep one item per line no matter how long they are.
Merge Merge remote-tracking branch 'refs/remotes/origin/master' into develop