Improve section on locating elements