cleaned up settings
Merge branch 'layers'