Added toggle
Enabling/Disabling layers now happens on click (no checkbox)
Some improvements