Manage part of org side_nav works
Changed unnecessary if block to unless
Additional changes to org side nav