Fix search layout in the header
Fix #97
Fix #99