LayerState handling improved
Keeping proper current LayerState pointer, so the layer strategy doesn't have to pass it in