added second layer, using new tiles, introducing edit-mode
merged