XWIKI-9341: Menu improvements when Workspaces activated.

* Small fixes.