More work on layers control