fix search and layout