moved Find to Container, improved OnTop