Added Delete Mapiing functionality and Icon for Edit Node Mapping.. plus some fixes