layer groups more fixes