Limit movement + layer fix