Update icon for And and add code to display names

of components on the diagram designer