Top section now stays
Fixes for searches top section
Lots of fixes
Merge