fixing search and layout