Moved search from lay-out to parts