Some cleanup, enable a map layer in the example