CONTENTBOX-192 Fixed menus

Ok, trying this again.
https://ortussolutions.atlassian.net/browse/CONTENTBOX-192