Add search button and correct width