Now with editable layernames
Added more useful labels to layers
Better label names