Include Programs and Directives in Controls' mapped objects

Also add directive icon when shown in sub trees;