Layers draw layout fix

Test