Add layers and bugfix visibility