Remove search from header and some cleanup