Adjust layer for obstacle and advObstacle
Fix bug
Add missing file