Fixing Issues with Org chart