Fix Layers

Omri Guetta, Omer Bar