update search and avatar handling
finish search layout