Add more containers, search layout modification