fixed hierarchy issues in cubes; still need to check icons/labels @ev