CONTENTBOX-411
Added more permissions that where missing and consolidated menus