REFACTOR Layers Actions for improved UI