fixed issues with layer configurabily