Search layouts refactor