Show / Hide layers.  Some cleanup.