Improve layerswitcher