fix bug search and layout