Reordering the layers is not working

Committing before major changes