Reordering layers

RH-31839 is fixed in the latest WIP