Layer grid improved & fixed a little issue