Search and Changes to layout in progress