fix search layout.
Merge branch 'fix/search_page' into develop