Fix layer draw. Should use new layers.* objects