Add cancel button to search bar.  Put back home location bar button