Fixed some layers positioning