You're right. I'll try this way.

Note: maybe there are other layers in the future that we want to keep (drawing, measuring,...), but we'll address that when it happens.