Fix expand layer items.
Clean up.
Merge branch '#103/fix-expand-layer-items' into develop