Fix legen and layer method in layer.py. Remove ShapeLegendClass import.
Merging action.