Remove Search and fix header