[IG] Some Bugfixes with the layers