fix search and layout tweaks