Feature/search design